Added new HOST_STATE_WaitForDeviceRemoval host state machine state for non-blocking...

[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 4bd89ec..ab09279 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -45,9 +45,11 @@ bool Pipe_ConfigurePipe(const uint8_t Number, const uint8_t Type, const uint8_t
 \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
+       Pipe_SetInfiniteINRequests();\r
+\r
        return Pipe_IsConfigured();\r
 }\r
 \r
@@ -70,9 +72,11 @@ void Pipe_ClearPipes(void)
 \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
-\r
-       USB_INT_Clear(USB_INT_HSOFI);\r
+       #endif\r
 \r
        for (;;)\r
        {\r
@@ -104,16 +108,58 @@ uint8_t Pipe_WaitUntilReady(void)
 \r
 uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
-                                 , uint8_t (* const Callback)(void)\r
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
        uint8_t* DataStream = (uint8_t*)Data;\r
        uint8_t  ErrorCode;\r
        \r
+       Pipe_SetToken(PIPE_TOKEN_OUT);\r
+\r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
+       {\r
+               Length -= BytesRemToAlignment;\r
+\r
+               switch (BytesRemToAlignment)\r
+               {\r
+                       default:\r
+                               do\r
+                               {\r
+                                       if (!(Pipe_IsReadWriteAllowed()))\r
+                                       {\r
+                                               Pipe_ClearOUT();\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_Write_Byte(*(DataStream++));\r
+                       case 7: Pipe_Write_Byte(*(DataStream++));\r
+                       case 6: Pipe_Write_Byte(*(DataStream++));\r
+                       case 5: Pipe_Write_Byte(*(DataStream++));\r
+                       case 4: Pipe_Write_Byte(*(DataStream++));\r
+                       case 3: Pipe_Write_Byte(*(DataStream++));\r
+                       case 2: Pipe_Write_Byte(*(DataStream++));\r
+                       case 1: Pipe_Write_Byte(*(DataStream++));\r
+                               } while (Length >= 8);  \r
+               }\r
+       }\r
+       #endif\r
+       \r
        while (Length)\r
        {\r
                if (!(Pipe_IsReadWriteAllowed()))\r
@@ -122,7 +168,7 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
                                \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
@@ -135,21 +181,63 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
                }\r
        }\r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_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
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
        uint8_t* DataStream = (uint8_t*)(Data + Length - 1);\r
        uint8_t  ErrorCode;\r
        \r
+       Pipe_SetToken(PIPE_TOKEN_OUT);\r
+\r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
+       {\r
+               Length -= BytesRemToAlignment;\r
+\r
+               switch (BytesRemToAlignment)\r
+               {\r
+                       default:\r
+                               do\r
+                               {\r
+                                       if (!(Pipe_IsReadWriteAllowed()))\r
+                                       {\r
+                                               Pipe_ClearOUT();\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_Write_Byte(*(DataStream--));\r
+                       case 7: Pipe_Write_Byte(*(DataStream--));\r
+                       case 6: Pipe_Write_Byte(*(DataStream--));\r
+                       case 5: Pipe_Write_Byte(*(DataStream--));\r
+                       case 4: Pipe_Write_Byte(*(DataStream--));\r
+                       case 3: Pipe_Write_Byte(*(DataStream--));\r
+                       case 2: Pipe_Write_Byte(*(DataStream--));\r
+                       case 1: Pipe_Write_Byte(*(DataStream--));\r
+                               } while (Length >= 8);  \r
+               }\r
+       }\r
+       #endif\r
+\r
        while (Length)\r
        {\r
                if (!(Pipe_IsReadWriteAllowed()))\r
@@ -158,7 +246,7 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
                                \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
@@ -171,20 +259,62 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
                }\r
        }\r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_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
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
        uint8_t  ErrorCode;\r
        \r
+       Pipe_SetToken(PIPE_TOKEN_IN);\r
+\r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
+       {\r
+               Length -= BytesRemToAlignment;\r
+\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
+       #endif\r
+\r
        while (Length)\r
        {\r
                if (!(Pipe_IsReadWriteAllowed()))\r
@@ -193,7 +323,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
                                \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
@@ -206,21 +336,63 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
                }\r
        }\r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_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
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
        uint8_t* DataStream = (uint8_t*)Buffer;\r
        uint8_t  ErrorCode;\r
        \r
+       Pipe_SetToken(PIPE_TOKEN_IN);\r
+\r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
+       {\r
+               Length -= BytesRemToAlignment;\r
+\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
+                                       *(DataStream++) = Pipe_Read_Byte();\r
+                       case 7: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 6: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 5: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 4: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 3: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 2: *(DataStream++) = Pipe_Read_Byte();\r
+                       case 1: *(DataStream++) = Pipe_Read_Byte();\r
+                               } while (Length >= 8);  \r
+               }\r
+       }\r
+       #endif\r
+\r
        while (Length)\r
        {\r
                if (!(Pipe_IsReadWriteAllowed()))\r
@@ -229,7 +401,7 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
                                \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
@@ -242,21 +414,63 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
                }\r
        }\r
 \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\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
+                                 , StreamCallbackPtr_t Callback\r
 #endif\r
                                                                 )\r
 {\r
        uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
        uint8_t  ErrorCode;\r
        \r
+       Pipe_SetToken(PIPE_TOKEN_IN);\r
+\r
        if ((ErrorCode = Pipe_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
+\r
+       if (Length >= 8)\r
+       {\r
+               Length -= BytesRemToAlignment;\r
+\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
+                                       *(DataStream--) = Pipe_Read_Byte();\r
+                       case 7: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 6: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 5: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 4: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 3: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 2: *(DataStream--) = Pipe_Read_Byte();\r
+                       case 1: *(DataStream--) = Pipe_Read_Byte();\r
+                               } while (Length >= 8);  \r
+               }\r
+       }\r
+       #endif\r
+\r
        while (Length)\r
        {\r
                if (!(Pipe_IsReadWriteAllowed()))\r
@@ -265,7 +479,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
                                \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
@@ -278,7 +492,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
                }\r
        }\r
        \r
-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
 #endif\r