projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Renamed Projects/Unfinished to Projects/Incomplete for consistancy.
[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Pipe.c
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 743bb91..9c6a53e 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -27,7 +27,9 @@
   arising out of or in connection with the use or performance of\r
   this software.\r
 */\r
   arising out of or in connection with the use or performance of\r
   this software.\r
 */\r
-#include "USBMode.h"\r
+\r
+#include "../HighLevel/USBMode.h"\r
+\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
 #define  INCLUDE_FROM_PIPE_C\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
 #define  INCLUDE_FROM_PIPE_C\r
@@ -35,7 +37,7 @@
 \r
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
 \r
 \r
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
 \r
-bool Pipe_ConfigurePipe(const uint8_t  Number, const uint8_t Type, const uint8_t Token, const uint8_t EndpointNumber,\r
+bool Pipe_ConfigurePipe(const uint8_t Number, const uint8_t Type, const uint8_t Token, const uint8_t EndpointNumber,\r
                                                const uint16_t Size, const uint8_t Banks)\r
 {\r
        Pipe_SelectPipe(Number);\r
                                                const uint16_t Size, const uint8_t Banks)\r
 {\r
        Pipe_SelectPipe(Number);\r
@@ -43,9 +45,11 @@ bool Pipe_ConfigurePipe(const uint8_t  Number, const uint8_t Type, const uint8_t
 \r
        UPCFG1X = 0;\r
        \r
 \r
        UPCFG1X = 0;\r
        \r
-       UPCFG0X = ((Type << EPTYPE0) | Token | (EndpointNumber << PEPNUM0));\r
+       UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));\r
        UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));\r
 \r
        UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));\r
 \r
+       Pipe_SetInfiniteINRequests();\r
+\r
        return Pipe_IsConfigured();\r
 }\r
 \r
        return Pipe_IsConfigured();\r
 }\r
 \r
@@ -66,17 +70,46 @@ void Pipe_ClearPipes(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r
-uint8_t Pipe_WaitUntilReady(void)\r
+bool Pipe_IsEndpointBound(uint8_t EndpointAddress)\r
 {\r
 {\r
-       uint8_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r
+       uint8_t PrevPipeNumber = Pipe_GetCurrentPipe();\r
+\r
+       for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)\r
+       {\r
+               Pipe_SelectPipe(PNum);\r
+               \r
+               if (Pipe_IsConfigured() && (Pipe_BoundEndpointNumber() == EndpointAddress))\r
+                 return true;\r
+       }\r
+       \r
+       Pipe_SelectPipe(PrevPipeNumber);\r
+       return false;\r
+}\r
 \r
 \r
-       USB_INT_Clear(USB_INT_HSOFI);\r
+uint8_t Pipe_WaitUntilReady(void)\r
+{\r
+       #if (USB_STREAM_TIMEOUT_MS < 0xFF)\r
+       uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;  \r
+       #else\r
+       uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r
+       #endif\r
 \r
 \r
-       while (!(Pipe_ReadWriteAllowed()))\r
+       for (;;)\r
        {\r
        {\r
+               if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
+               {\r
+                       if (Pipe_IsINReceived())\r
+                         return PIPE_READYWAIT_NoError;\r
+               }\r
+               else\r
+               {\r
+                       if (Pipe_IsOUTReady())\r
+                         return PIPE_READYWAIT_NoError;                \r
+               }\r
+\r
                if (Pipe_IsStalled())\r
                  return PIPE_READYWAIT_PipeStalled;\r
                if (Pipe_IsStalled())\r
                  return PIPE_READYWAIT_PipeStalled;\r
-               else if (!(USB_IsConnected))\r
+               else if (USB_HostState == HOST_STATE_Unattached)\r
                  return PIPE_READYWAIT_DeviceDisconnected;\r
                          \r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
                  return PIPE_READYWAIT_DeviceDisconnected;\r
                          \r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
@@ -87,172 +120,153 @@ uint8_t Pipe_WaitUntilReady(void)
                          return PIPE_READYWAIT_Timeout;\r
                }\r
        }\r
                          return PIPE_READYWAIT_Timeout;\r
                }\r
        }\r
-       \r
-       return PIPE_READYWAIT_NoError;\r
 }\r
 \r
 }\r
 \r
-uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length\r
+uint8_t Pipe_Discard_Stream(uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 #if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
 #endif\r
                                                                 )\r
 {\r
-       uint8_t* DataStream = (uint8_t*)Data;\r
        uint8_t  ErrorCode;\r
        \r
        uint8_t  ErrorCode;\r
        \r
-       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-         return ErrorCode;\r
+       Pipe_SetToken(PIPE_TOKEN_IN);\r
 \r
 \r
-       while (Length--)\r
-       {\r
-               if (!(Pipe_ReadWriteAllowed()))\r
-               {\r
-                       Pipe_ClearCurrentBank();\r
-                               \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-\r
-               Pipe_Write_Byte(*(DataStream++));\r
-       }\r
-\r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
-}\r
-\r
-uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)(Data + Length - 1);\r
-       uint8_t  ErrorCode;\r
-       \r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
-       while (Length--)\r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
        {\r
        {\r
-               if (!(Pipe_ReadWriteAllowed()))\r
-               {\r
-                       Pipe_ClearCurrentBank();\r
-                               \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
-                       #endif\r
+               Length -= BytesRemToAlignment;\r
 \r
 \r
-                       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-                         return ErrorCode;\r
+               switch (BytesRemToAlignment)\r
+               {\r
+                       default:\r
+                               do\r
+                               {\r
+                                       if (!(Pipe_IsReadWriteAllowed()))\r
+                                       {\r
+                                               Pipe_ClearIN();\r
+                                                       \r
+                                               #if !defined(NO_STREAM_CALLBACKS)\r
+                                               if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
+                                                 return PIPE_RWSTREAM_CallbackAborted;\r
+                                               #endif\r
+\r
+                                               if ((ErrorCode = Pipe_WaitUntilReady()))\r
+                                                 return ErrorCode;\r
+                                       }\r
+\r
+                                       Length -= 8;\r
+                                       \r
+                                       Pipe_Discard_Byte();\r
+                       case 7: Pipe_Discard_Byte();\r
+                       case 6: Pipe_Discard_Byte();\r
+                       case 5: Pipe_Discard_Byte();\r
+                       case 4: Pipe_Discard_Byte();\r
+                       case 3: Pipe_Discard_Byte();\r
+                       case 2: Pipe_Discard_Byte();\r
+                       case 1: Pipe_Discard_Byte();\r
+                               } while (Length >= 8);  \r
                }\r
                }\r
-\r
-               Pipe_Write_Byte(*(DataStream--));\r
        }\r
        }\r
+       #endif\r
 \r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
-}\r
-\r
-uint8_t Pipe_Discard_Stream(uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length--)\r
+       while (Length)\r
        {\r
        {\r
-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r
                {\r
                {\r
-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearIN();\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
-\r
-               Pipe_Discard_Byte();\r
-       }\r
-\r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
-}\r
-\r
-uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length\r
-                                                       #if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)Buffer;\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length--)\r
-       {\r
-               if (!(Pipe_ReadWriteAllowed()))\r
+               else\r
                {\r
                {\r
-                       Pipe_ClearCurrentBank();\r
-                               \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-                         return ErrorCode;\r
+                       Pipe_Discard_Byte();\r
+                       Length--;\r
                }\r
                }\r
-               \r
-               *(DataStream++) = Pipe_Read_Byte();\r
        }\r
 \r
        }\r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
 }\r
 \r
-uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length\r
-                                                       #if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length--)\r
-       {\r
-               if (!(Pipe_ReadWriteAllowed()))\r
-               {\r
-                       Pipe_ClearCurrentBank();\r
-                               \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Pipe_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-\r
-               *(DataStream--) = Pipe_Read_Byte();\r
-       }\r
-       \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
-}\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
 \r
 #endif\r
 \r
 #endif\r
USB isp AVR programmer