projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added V2 protocol handlers for the READ and WRITE memory commands in the AVRISP proje...
[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 dca7554..8b3922a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -71,6 +71,30 @@ void Endpoint_ClearEndpoints(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r
+void Endpoint_ClearStatusStage(void)\r
+{\r
+       if (USB_ControlRequest.bmRequestType & REQDIR_DEVICETOHOST)\r
+       {\r
+               while (!(Endpoint_IsOUTReceived()))\r
+               {\r
+                       if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                         return;\r
+               }\r
+\r
+               Endpoint_ClearOUT();\r
+       }\r
+       else\r
+       {\r
+               while (!(Endpoint_IsINReady()))\r
+               {\r
+                       if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                         return;\r
+               }\r
+               \r
+               Endpoint_ClearIN();\r
+       }\r
+}\r
+\r
 #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
@@ -93,7 +117,7 @@ uint8_t Endpoint_WaitUntilReady(void)
                          return ENDPOINT_READYWAIT_NoError;            \r
                }\r
                \r
                          return ENDPOINT_READYWAIT_NoError;            \r
                }\r
                \r
-               if (!(USB_IsConnected))\r
+               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r
                  return ENDPOINT_READYWAIT_EndpointStalled;\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r
                  return ENDPOINT_READYWAIT_EndpointStalled;\r
@@ -119,113 +143,45 @@ 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
-       {\r
-               if (!(Endpoint_IsReadWriteAllowed()))\r
-               {\r
-                       Endpoint_ClearOUT();\r
-\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return ENDPOINT_RWSTREAM_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-               else\r
-               {\r
-                       Endpoint_Discard_Byte();\r
-                       Length--;\r
-               }\r
-       }\r
-       \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
-                                 , StreamCallbackPtr_t Callback\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream   = (uint8_t*)Buffer;\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length)\r
-       {\r
-               if (!(Endpoint_IsReadWriteAllowed()))\r
-               {\r
-                       Endpoint_ClearIN();\r
-                       \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return ENDPOINT_RWSTREAM_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-               else\r
-               {\r
-                       Endpoint_Write_Byte(*(DataStream++));\r
-                       Length--;\r
-               }\r
-       }\r
-       \r
-       return ENDPOINT_RWSTREAM_NoError;\r
-}\r
+       #if defined(FAST_STREAM_TRANSFERS)\r
+       uint8_t BytesRemToAlignment = (Endpoint_BytesInEndpoint() & 0x07);\r
 \r
 \r
-uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
-                                 , StreamCallbackPtr_t Callback\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length)\r
+       if (Length >= 8)\r
        {\r
        {\r
-               if (!(Endpoint_IsReadWriteAllowed()))\r
-               {\r
-                       Endpoint_ClearIN();\r
+               Length -= BytesRemToAlignment;\r
 \r
 \r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return ENDPOINT_RWSTREAM_CallbackAborted;\r
-                       #endif\r
-\r
-                       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-               else\r
+               switch (BytesRemToAlignment)\r
                {\r
                {\r
-                       Endpoint_Write_Byte(*(DataStream--));\r
-                       Length--;\r
+                       default:\r
+                               do\r
+                               {\r
+                                       if (!(Endpoint_IsReadWriteAllowed()))\r
+                                       {\r
+                                               Endpoint_ClearOUT();\r
+\r
+                                               #if !defined(NO_STREAM_CALLBACKS)\r
+                                               if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
+                                                 return ENDPOINT_RWSTREAM_CallbackAborted;\r
+                                               #endif\r
+\r
+                                               if ((ErrorCode = Endpoint_WaitUntilReady()))\r
+                                                 return ErrorCode;\r
+                                       }\r
+\r
+                                       Length -= 8;\r
+                                       \r
+                                       Endpoint_Discard_Byte();\r
+                       case 7: Endpoint_Discard_Byte();\r
+                       case 6: Endpoint_Discard_Byte();\r
+                       case 5: Endpoint_Discard_Byte();\r
+                       case 4: Endpoint_Discard_Byte();\r
+                       case 3: Endpoint_Discard_Byte();\r
+                       case 2: Endpoint_Discard_Byte();\r
+                       case 1: Endpoint_Discard_Byte();\r
+                               } while (Length >= 8);  \r
                }\r
        }\r
                }\r
        }\r
-       \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
-                                 , StreamCallbackPtr_t Callback\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)Buffer;\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-         return ErrorCode;\r
+       #endif\r
 \r
        while (Length)\r
        {\r
 \r
        while (Length)\r
        {\r
@@ -243,7 +199,7 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
                }\r
                else\r
                {\r
                }\r
                else\r
                {\r
-                       *(DataStream++) = Endpoint_Read_Byte();\r
+                       Endpoint_Discard_Byte();\r
                        Length--;\r
                }\r
        }\r
                        Length--;\r
                }\r
        }\r
@@ -251,160 +207,116 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
        return ENDPOINT_RWSTREAM_NoError;\r
 }\r
 \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
-                                 , StreamCallbackPtr_t Callback\r
-#endif\r
-                                                                )\r
-{\r
-       uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
-       uint8_t  ErrorCode;\r
-       \r
-       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-         return ErrorCode;\r
-\r
-       while (Length)\r
-       {\r
-               if (!(Endpoint_IsReadWriteAllowed()))\r
-               {\r
-                       Endpoint_ClearOUT();\r
-\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                       if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
-                         return ENDPOINT_RWSTREAM_CallbackAborted;\r
-                       #endif\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_LE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr++))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr--))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Endpoint_Read_Byte()\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Endpoint_Read_Byte()\r
+#include "Template/Template_Endpoint_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE\r
+#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())\r
+#include "Template/Template_Endpoint_RW.c"\r
 \r
 \r
-                       if ((ErrorCode = Endpoint_WaitUntilReady()))\r
-                         return ErrorCode;\r
-               }\r
-               else\r
-               {\r
-                       *(DataStream--) = Endpoint_Read_Byte();\r
-                       Length--;\r
-               }\r
-       }\r
-       \r
-       return ENDPOINT_RWSTREAM_NoError;\r
-}\r
 #endif\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
-       bool     LastPacketFull = false;\r
-       \r
-       if (Length > USB_ControlRequest.wLength)\r
-         Length = USB_ControlRequest.wLength;\r
-       \r
-       while (Length && !(Endpoint_IsOUTReceived()))\r
-       {\r
-               while (!(Endpoint_IsINReady()));\r
-               \r
-               while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
-               {\r
-                       Endpoint_Write_Byte(*(DataStream++));\r
-                       Length--;\r
-               }\r
-               \r
-               LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       if (Endpoint_IsOUTReceived())\r
-         return ENDPOINT_RWCSTREAM_HostAborted;\r
-       \r
-       if (LastPacketFull)\r
-       {\r
-               while (!(Endpoint_IsINReady()));\r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       while (!(Endpoint_IsOUTReceived()));\r
-\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
-       if (Length > USB_ControlRequest.wLength)\r
-         Length = USB_ControlRequest.wLength;\r
-\r
-       while (Length && !(Endpoint_IsOUTReceived()))\r
-       {\r
-               if (Endpoint_IsINReady())\r
-               {\r
-                       while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
-                       {\r
-                               Endpoint_Write_Byte(*(DataStream--));\r
-                               Length--;\r
-                       }\r
-                       \r
-                       LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-                       Endpoint_ClearIN();\r
-               }\r
-       }\r
-       \r
-       if (Endpoint_IsOUTReceived())\r
-         return ENDPOINT_RWCSTREAM_HostAborted;\r
-       \r
-       if (LastPacketFull)\r
-       {\r
-               while (!(Endpoint_IsINReady()));\r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       while (!(Endpoint_IsOUTReceived()));\r
-\r
-       return ENDPOINT_RWCSTREAM_NoError;\r
-}\r
-\r
-uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)\r
-{\r
-       uint8_t* DataStream = (uint8_t*)Buffer;\r
-       \r
-       while (Length)\r
-       {\r
-               if (Endpoint_IsOUTReceived())\r
-               {\r
-                       while (Length && Endpoint_BytesInEndpoint())\r
-                       {\r
-                               *(DataStream++) = Endpoint_Read_Byte();\r
-                               Length--;\r
-                       }\r
-                       \r
-                       Endpoint_ClearOUT();\r
-               }\r
-       }\r
-       \r
-       while (!(Endpoint_IsINReady()));\r
-       \r
-       return ENDPOINT_RWCSTREAM_NoError;\r
-}\r
-\r
-uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)\r
-{\r
-       uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
-       \r
-       while (Length)\r
-       {\r
-               if (Endpoint_IsOUTReceived())\r
-               {\r
-                       while (Length && Endpoint_BytesInEndpoint())\r
-                       {\r
-                               *(DataStream--) = Endpoint_Read_Byte();\r
-                               Length--;\r
-                       }\r
-                       \r
-                       Endpoint_ClearOUT();\r
-               }\r
-       }\r
-       \r
-       while (!(Endpoint_IsINReady()));\r
-\r
-       return ENDPOINT_RWCSTREAM_NoError;\r
-}\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr++))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr--))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))\r
+#include "Template/Template_Endpoint_Control_W.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Endpoint_Read_Byte()\r
+#include "Template/Template_Endpoint_Control_R.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())\r
+#include "Template/Template_Endpoint_Control_R.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Endpoint_Read_Byte()\r
+#include "Template/Template_Endpoint_Control_R.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())\r
+#include "Template/Template_Endpoint_Control_R.c"\r
 \r
 #endif\r
 \r
 #endif\r
USB isp AVR programmer