Error status LEDs shown when device endpoint configuration fails to complete.

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Endpoint.c

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index 4615baa..fd97b75 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -74,9 +74,11 @@ void Endpoint_ClearEndpoints(void)
 #if !defined(CONTROL_ONLY_DEVICE)\r
 uint8_t Endpoint_WaitUntilReady(void)\r
 {\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
 uint8_t Endpoint_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
        uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r

-\r
-       USB_INT_Clear(USB_INT_SOFI);\r
+       #endif\r

 \r
        for (;;)\r
        {\r
 \r
        for (;;)\r
        {\r


@@ -96,9 +98,9 @@ uint8_t Endpoint_WaitUntilReady(void)
                else if (Endpoint_IsStalled())\r
                  return ENDPOINT_READYWAIT_EndpointStalled;\r
                          \r
                else if (Endpoint_IsStalled())\r
                  return ENDPOINT_READYWAIT_EndpointStalled;\r
                          \r

-               if (USB_INT_HasOccurred(USB_INT_SOFI))\r
+               if (USB_INT_HasOccurred(USB_INT_HSOFI))\r

                {\r
                {\r

-                       USB_INT_Clear(USB_INT_SOFI);\r
+                       USB_INT_Clear(USB_INT_HSOFI);\r

 \r
                        if (!(TimeoutMSRem--))\r
                          return ENDPOINT_READYWAIT_Timeout;\r
 \r
                        if (!(TimeoutMSRem--))\r
                          return ENDPOINT_READYWAIT_Timeout;\r


@@ -108,7 +110,7 @@ uint8_t Endpoint_WaitUntilReady(void)
 \r
 uint8_t Endpoint_Discard_Stream(uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 \r
 uint8_t Endpoint_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
 #endif\r
                                                                )\r
 {\r


@@ -117,7 +119,7 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r

-       while (Length--)\r
+       while (Length)\r

        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r
        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r


@@ -125,7 +127,7 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 \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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -134,15 +136,16 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
                else\r
                {\r
                        Endpoint_Discard_Byte();\r
                else\r
                {\r
                        Endpoint_Discard_Byte();\r

+                       Length--;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 }\r
 \r
 uint8_t Endpoint_Write_Stream_LE(const 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
 #endif\r
                                                                 )\r
 {\r


@@ -152,7 +155,7 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r

-       while (Length--)\r
+       while (Length)\r

        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r
        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r


@@ -160,7 +163,7 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
                        \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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -169,15 +172,16 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
                else\r
                {\r
                        Endpoint_Write_Byte(*(DataStream++));\r
                else\r
                {\r
                        Endpoint_Write_Byte(*(DataStream++));\r

+                       Length--;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 }\r
 \r
 uint8_t Endpoint_Write_Stream_BE(const 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
 #endif\r
                                                                 )\r
 {\r


@@ -187,7 +191,7 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r

-       while (Length--)\r
+       while (Length)\r

        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r
        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r


@@ -195,7 +199,7 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
 \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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -204,15 +208,16 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
                else\r
                {\r
                        Endpoint_Write_Byte(*(DataStream--));\r
                else\r
                {\r
                        Endpoint_Write_Byte(*(DataStream--));\r

+                       Length--;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 }\r
 \r
 uint8_t Endpoint_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
 #endif\r
                                                                 )\r
 {\r


@@ -222,7 +227,7 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r

-       while (Length--)\r
+       while (Length)\r

        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r
        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r


@@ -230,7 +235,7 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
 \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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -239,15 +244,16 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
                else\r
                {\r
                        *(DataStream++) = Endpoint_Read_Byte();\r
                else\r
                {\r
                        *(DataStream++) = Endpoint_Read_Byte();\r

+                       Length--;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
 }\r
 \r
 uint8_t Endpoint_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
 #endif\r
                                                                 )\r
 {\r


@@ -257,7 +263,7 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
          return ErrorCode;\r
 \r

-       while (Length--)\r
+       while (Length)\r

        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r
        {\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
                {\r


@@ -265,7 +271,7 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
 \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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -274,18 +280,21 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
                else\r
                {\r
                        *(DataStream--) = Endpoint_Read_Byte();\r
                else\r
                {\r
                        *(DataStream--) = Endpoint_Read_Byte();\r

+                       Length--;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 #endif\r
 \r
 uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)\r
 {\r
 }\r
 #endif\r
 \r
 uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)\r
 {\r

-       uint8_t* DataStream    = (uint8_t*)Buffer;\r
+       uint8_t* DataStream     = (uint8_t*)Buffer;\r

        bool     LastPacketFull = false;\r
        bool     LastPacketFull = false;\r

-       bool     ShortTransfer = (Length < USB_ControlRequest.wLength);\r
+       \r
+       if (Length > USB_ControlRequest.wLength)\r
+         Length = USB_ControlRequest.wLength;\r

        \r
        while (Length && !(Endpoint_IsOUTReceived()))\r
        {\r
        \r
        while (Length && !(Endpoint_IsOUTReceived()))\r
        {\r


@@ -294,7 +303,6 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r
                        Endpoint_Write_Byte(*(DataStream++));\r
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r
                        Endpoint_Write_Byte(*(DataStream++));\r

-                       \r

                        Length--;\r
                }\r
                \r
                        Length--;\r
                }\r
                \r


@@ -303,9 +311,9 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r

-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        \r

-       if (LastPacketFull || ShortTransfer)\r
+       if (LastPacketFull)\r

        {\r
                while (!(Endpoint_IsINReady()));\r
                Endpoint_ClearIN();\r
        {\r
                while (!(Endpoint_IsINReady()));\r
                Endpoint_ClearIN();\r


@@ -313,34 +321,36 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)\r
 {\r
        uint8_t* DataStream     = (uint8_t*)(Buffer + Length - 1);\r
        bool     LastPacketFull = false;\r
 }\r
 \r
 uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)\r
 {\r
        uint8_t* DataStream     = (uint8_t*)(Buffer + Length - 1);\r
        bool     LastPacketFull = false;\r

-       bool     ShortTransfer  = (Length < USB_ControlRequest.wLength);\r

        \r
        \r

+       if (Length > USB_ControlRequest.wLength)\r
+         Length = USB_ControlRequest.wLength;\r
+\r

        while (Length && !(Endpoint_IsOUTReceived()))\r
        {\r
        while (Length && !(Endpoint_IsOUTReceived()))\r
        {\r

-               while (!(Endpoint_IsINReady()));\r
-               \r
-               while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
+               if (Endpoint_IsINReady())\r

                {\r
                {\r

-                       Endpoint_Write_Byte(*(DataStream--));\r
+                       while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
+                       {\r
+                               Endpoint_Write_Byte(*(DataStream--));\r
+                               Length--;\r
+                       }\r

                        \r
                        \r

-                       Length--;\r
+                       LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
+                       Endpoint_ClearIN();\r

                }\r
                }\r

-               \r
-               LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-               Endpoint_ClearIN();\r

        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r

-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        \r

-       if (LastPacketFull || ShortTransfer)\r
+       if (LastPacketFull)\r

        {\r
                while (!(Endpoint_IsINReady()));\r
                Endpoint_ClearIN();\r
        {\r
                while (!(Endpoint_IsINReady()));\r
                Endpoint_ClearIN();\r


@@ -348,7 +358,7 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)\r
 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)\r


@@ -357,21 +367,21 @@ uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
        \r
        while (Length)\r
        {\r
        \r
        while (Length)\r
        {\r

-               while (!(Endpoint_IsOUTReceived()));\r
-               \r
-               while (Length && Endpoint_BytesInEndpoint())\r
+               if (Endpoint_IsOUTReceived())\r

                {\r
                {\r

-                       *(DataStream++) = Endpoint_Read_Byte();\r
+                       while (Length && Endpoint_BytesInEndpoint())\r
+                       {\r
+                               *(DataStream++) = Endpoint_Read_Byte();\r
+                               Length--;\r
+                       }\r

                        \r
                        \r

-                       Length--;\r
+                       Endpoint_ClearOUT();\r

                }\r
                }\r

-               \r
-               Endpoint_ClearOUT();\r

        }\r
        \r
        while (!(Endpoint_IsINReady()));\r
        \r
        }\r
        \r
        while (!(Endpoint_IsINReady()));\r
        \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)\r
 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)\r


@@ -380,21 +390,21 @@ uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
        \r
        while (Length)\r
        {\r
        \r
        while (Length)\r
        {\r

-               while (!(Endpoint_IsOUTReceived()));\r
-               \r
-               while (Length && Endpoint_BytesInEndpoint())\r
+               if (Endpoint_IsOUTReceived())\r

                {\r
                {\r

-                       *(DataStream--) = Endpoint_Read_Byte();\r
+                       while (Length && Endpoint_BytesInEndpoint())\r
+                       {\r
+                               *(DataStream--) = Endpoint_Read_Byte();\r
+                               Length--;\r
+                       }\r

                        \r
                        \r

-                       Length--;\r
+                       Endpoint_ClearOUT();\r

                }\r
                }\r

-               \r
-               Endpoint_ClearOUT();\r

        }\r
        \r
        while (!(Endpoint_IsINReady()));\r
 \r
        }\r
        \r
        while (!(Endpoint_IsINReady()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 #endif\r
 }\r
 \r
 #endif\r