Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions...
[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Pipe.c
index ab09279..18fbc19 100644 (file)
@@ -106,162 +106,6 @@ uint8_t Pipe_WaitUntilReady(void)
        }\r
 }\r
 \r
-uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\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
-               {\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
-               else\r
-               {\r
-                       Pipe_Write_Byte(*(DataStream++));\r
-                       Length--;\r
-               }\r
-       }\r
-\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
-                                 , 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
-               {\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
-               else\r
-               {\r
-                       Pipe_Write_Byte(*(DataStream--));\r
-                       Length--;\r
-               }\r
-       }\r
-\r
-       return PIPE_RWSTREAM_NoError;\r
-}\r
-\r
 uint8_t Pipe_Discard_Stream(uint16_t Length\r
 #if !defined(NO_STREAM_CALLBACKS)\r
                                  , StreamCallbackPtr_t Callback\r
@@ -339,160 +183,64 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
        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
-                                 , 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
-               {\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
-               else\r
-               {\r
-                       *(DataStream++) = Pipe_Read_Byte();\r
-                       Length--;\r
-               }\r
-       }\r
-\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
-                                 , 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
-               {\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
-               else\r
-               {\r
-                       *(DataStream--) = Pipe_Read_Byte();\r
-                       Length--;\r
-               }\r
-       }\r
-       \r
-       return PIPE_RWSTREAM_NoError;\r
-}\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
+#define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
 \r
 #endif\r