Make Endpoint control transfers more reliable; early-abort when an incomplete packet...

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

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c
index a2a0c3b..f6afb69 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_R.c
@@ -1,8 +1,12 @@
 uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)\r
 {\r
-       uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));\r
+       uint8_t* DataStream     = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));\r
+       bool     LastPacketFull = false;\r
        \r
-       while (Length)\r
+       if (Length > USB_ControlRequest.wLength)\r
+         Length = USB_ControlRequest.wLength;\r
+\r
+       while (Length || LastPacketFull)\r
        {\r
                if (Endpoint_IsSETUPReceived())\r
                  return ENDPOINT_RWCSTREAM_HostAborted;\r
@@ -12,6 +16,8 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)
                  \r
                if (Endpoint_IsOUTReceived())\r
                {\r
+                       LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
+               \r
                        while (Length && Endpoint_BytesInEndpoint())\r
                        {\r
                                TEMPLATE_TRANSFER_BYTE(DataStream);\r
@@ -19,6 +25,9 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)
                        }\r
                        \r
                        Endpoint_ClearOUT();\r
+                       \r
+                       if (!(LastPacketFull))\r
+                         Length = 0;\r
                }                 \r
        }\r
        \r