Renamed the the TotalHIDReports element of the HID descriptor structure in the HID...

[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 273e190..bd264b1 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -28,7 +28,8 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#include "USBMode.h"\r
+#include "../HighLevel/USBMode.h"\r
+\r

 #if defined(USB_CAN_BE_DEVICE)\r
 \r
 #define  INCLUDE_FROM_ENDPOINT_C\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
 #define  INCLUDE_FROM_ENDPOINT_C\r


@@ -38,34 +39,23 @@
 uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;\r
 #endif\r
 \r
 uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;\r
 #endif\r
 \r

-#if !defined(STATIC_ENDPOINT_CONFIGURATION)\r
-bool Endpoint_ConfigureEndpoint(const uint8_t  Number, const uint8_t Type, const uint8_t Direction,\r
-                                           const uint16_t Size, const uint8_t Banks)\r
+uint8_t Endpoint_BytesToEPSizeMaskDynamic(const uint16_t Size)\r

 {\r
 {\r

-       Endpoint_SelectEndpoint(Number);\r
-       Endpoint_EnableEndpoint();\r
-\r
-       UECFG1X = 0;    \r
-\r
-       UECFG0X = ((Type << EPTYPE0) | Direction);\r
-       UECFG1X = ((1 << ALLOC) | Banks | Endpoint_BytesToEPSizeMask(Size));\r
-\r
-       return Endpoint_IsConfigured();\r
+       return Endpoint_BytesToEPSizeMask(Size);\r

 }\r
 }\r

-#else\r
-bool Endpoint_ConfigureEndpointStatic(const uint8_t Number, const uint8_t UECFG0XData, const uint8_t UECFG1XData)\r
+\r
+bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, const uint8_t UECFG0XData, const uint8_t UECFG1XData)\r

 {\r
        Endpoint_SelectEndpoint(Number);\r
        Endpoint_EnableEndpoint();\r
 \r
 {\r
        Endpoint_SelectEndpoint(Number);\r
        Endpoint_EnableEndpoint();\r
 \r

-       UECFG1X = 0;    \r
+       UECFG1X = 0;\r

 \r
        UECFG0X = UECFG0XData;\r
        UECFG1X = UECFG1XData;\r
 \r
        return Endpoint_IsConfigured();\r
 }\r
 \r
        UECFG0X = UECFG0XData;\r
        UECFG1X = UECFG1XData;\r
 \r
        return Endpoint_IsConfigured();\r
 }\r

-#endif\r

 \r
 void Endpoint_ClearEndpoints(void)\r
 {\r
 \r
 void Endpoint_ClearEndpoints(void)\r
 {\r


@@ -81,14 +71,26 @@ void Endpoint_ClearEndpoints(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

+#if !defined(CONTROL_ONLY_DEVICE)\r

 uint8_t Endpoint_WaitUntilReady(void)\r
 {\r
 uint8_t Endpoint_WaitUntilReady(void)\r
 {\r

-       uint8_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r
+       uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r

 \r
        USB_INT_Clear(USB_INT_SOFI);\r
 \r
 \r
        USB_INT_Clear(USB_INT_SOFI);\r
 \r

-       while (!(Endpoint_ReadWriteAllowed()))\r
+       for (;;)\r

        {\r
        {\r

+               if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)\r
+               {\r
+                       if (Endpoint_IsINReady())\r
+                         return ENDPOINT_READYWAIT_NoError;\r
+               }\r
+               else\r
+               {\r
+                       if (Endpoint_IsOUTReceived())\r
+                         return ENDPOINT_READYWAIT_NoError;            \r
+               }\r
+               \r

                if (!(USB_IsConnected))\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r
                if (!(USB_IsConnected))\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r


@@ -102,8 +104,6 @@ uint8_t Endpoint_WaitUntilReady(void)
                          return ENDPOINT_READYWAIT_Timeout;\r
                }\r
        }\r
                          return ENDPOINT_READYWAIT_Timeout;\r
                }\r
        }\r

-       \r
-       return ENDPOINT_READYWAIT_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Discard_Stream(uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Discard_Stream(uint16_t Length\r


@@ -117,25 +117,28 @@ 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
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Discard_Byte();\r
+               else\r
+               {\r
+                       Endpoint_Discard_Byte();\r
+                       Length--;\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
 }\r
 \r
 uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length\r


@@ -150,25 +153,28 @@ 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
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Write_Byte(*(DataStream++));\r
+               else\r
+               {\r
+                       Endpoint_Write_Byte(*(DataStream++));\r
+                       Length--;\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
 }\r
 \r
 uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length\r


@@ -183,25 +189,28 @@ 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
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Write_Byte(*(DataStream--));\r
+               else\r
+               {\r
+                       Endpoint_Write_Byte(*(DataStream--));\r
+                       Length--;\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
 }\r
 \r
 uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length\r


@@ -216,25 +225,28 @@ 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
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-               \r
-               *(DataStream++) = Endpoint_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream++) = Endpoint_Read_Byte();\r
+                       Length--;\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
 }\r
 \r
 uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length\r


@@ -249,93 +261,102 @@ 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
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\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 ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-               \r
-               *(DataStream--) = Endpoint_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream--) = Endpoint_Read_Byte();\r
+                       Length--;\r
+               }\r

        }\r
        \r
        }\r
        \r

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

 }\r
 }\r

+#endif\r

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

-       uint8_t* DataStream = (uint8_t*)Buffer;\r
-       bool     SendZLP    = true;\r
+       uint8_t* DataStream     = (uint8_t*)Buffer;\r
+       bool     LastPacketFull = false;\r

        \r
        \r

-       while (Length && !(Endpoint_IsSetupOUTReceived()))\r
+       if (Length > USB_ControlRequest.wLength)\r
+         Length = USB_ControlRequest.wLength;\r
+       \r
+       while (Length && !(Endpoint_IsOUTReceived()))\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
+               while (!(Endpoint_IsINReady()));\r

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

-                       \r

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

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

        }\r
        \r
        }\r
        \r

-       if (Endpoint_IsSetupOUTReceived())\r
-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+       if (Endpoint_IsOUTReceived())\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        \r

-       if (SendZLP)\r
+       if (LastPacketFull)\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               while (!(Endpoint_IsINReady()));\r
+               Endpoint_ClearIN();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
+       while (!(Endpoint_IsOUTReceived()));\r

 \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
 }\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     SendZLP    = true;\r
+       uint8_t* DataStream     = (uint8_t*)(Buffer + Length - 1);\r
+       bool     LastPacketFull = false;\r

        \r
        \r

-       while (Length && !(Endpoint_IsSetupOUTReceived()))\r
+       if (Length > USB_ControlRequest.wLength)\r
+         Length = USB_ControlRequest.wLength;\r
+\r
+       while (Length && !(Endpoint_IsOUTReceived()))\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\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
-               SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-               Endpoint_ClearSetupIN();\r

        }\r
        \r
        }\r
        \r

-       if (Endpoint_IsSetupOUTReceived())\r
-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+       if (Endpoint_IsOUTReceived())\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        \r

-       if (SendZLP)\r
+       if (LastPacketFull)\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               while (!(Endpoint_IsINReady()));\r
+               Endpoint_ClearIN();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
+       while (!(Endpoint_IsOUTReceived()));\r

 \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


@@ -344,21 +365,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_IsSetupOUTReceived()));\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_ClearSetupOUT();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

        \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


@@ -367,21 +388,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_IsSetupOUTReceived()));\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_ClearSetupOUT();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

 \r
 \r

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

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