Renamed all low level Endpoint_Read_*, Endpoint_Write_* and Endpoint_Discard_* functi...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / EndpointStream.c

diff --git a/LUFA/Drivers/USB/Core/EndpointStream.c b/LUFA/Drivers/USB/Core/EndpointStream.c
index 893a6ff..0deb284 100644 (file)
--- a/LUFA/Drivers/USB/Core/EndpointStream.c
+++ b/LUFA/Drivers/USB/Core/EndpointStream.c
@@ -65,7 +65,7 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length,
                }\r
                else\r
                {\r
-                       Endpoint_Discard_Byte();\r
+                       Endpoint_Discard_8();\r
 \r
                        Length--;\r
                        BytesInTransfer++;\r
@@ -104,7 +104,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
                }\r
                else\r
                {\r
-                       Endpoint_Write_Byte(0);\r
+                       Endpoint_Write_8(0);\r
 \r
                        Length--;\r
                        BytesInTransfer++;\r
@@ -119,7 +119,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE\r
@@ -127,7 +127,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE\r
@@ -135,7 +135,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE\r
@@ -143,7 +143,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()\r
 #include "Template/Template_Endpoint_RW.c"\r
 \r
 #if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
@@ -152,7 +152,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE\r
@@ -160,7 +160,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_RW.c"\r
 #endif\r
 \r
@@ -170,7 +170,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE\r
@@ -178,7 +178,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE\r
@@ -186,7 +186,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())\r
        #include "Template/Template_Endpoint_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE\r
@@ -194,7 +194,7 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())\r
        #include "Template/Template_Endpoint_RW.c"\r
 #endif\r
 \r
@@ -203,38 +203,38 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()\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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()\r
 #include "Template/Template_Endpoint_Control_R.c"\r
 \r
 #if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_Control_W.c"\r
 #endif\r
 \r
@@ -242,25 +242,25 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))\r
        #include "Template/Template_Endpoint_Control_W.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())\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_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount\r
-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())\r
        #include "Template/Template_Endpoint_Control_R.c"\r
 #endif\r
 \r