Oops - fix bad include path in the moved USBKEY Dataflash board driver header.

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

diff --git a/LUFA/Drivers/USB/Core/PipeStream.c b/LUFA/Drivers/USB/Core/PipeStream.c
index 66babf4..6b896ba 100644 (file)
--- a/LUFA/Drivers/USB/Core/PipeStream.c
+++ b/LUFA/Drivers/USB/Core/PipeStream.c
@@ -66,7 +66,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length,
                }\r
                else\r
                {\r
                }\r
                else\r
                {\r

-                       Pipe_Discard_Byte();\r
+                       Pipe_Discard_8();\r

                        \r
                        Length--;\r
                        BytesInTransfer++;\r
                        \r
                        Length--;\r
                        BytesInTransfer++;\r


@@ -109,7 +109,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
                }\r
                else\r
                {\r
                }\r
                else\r
                {\r

-                       Pipe_Write_Byte(0);\r
+                       Pipe_Write_8(0);\r

                        \r
                        Length--;\r
                        BytesInTransfer++;\r
                        \r
                        Length--;\r
                        BytesInTransfer++;\r


@@ -128,7 +128,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)\r

 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE\r


@@ -137,7 +137,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*BufferPtr)\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)\r

 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE\r


@@ -146,7 +146,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()\r

 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE\r


@@ -155,7 +155,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
 #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
 #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_Byte()\r
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()\r

 #include "Template/Template_Pipe_RW.c"\r
 \r
 #if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r
 #include "Template/Template_Pipe_RW.c"\r
 \r
 #if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)\r


@@ -165,7 +165,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(BufferPtr))\r

        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r
        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE\r


@@ -174,7 +174,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(BufferPtr))\r

        #include "Template/Template_Pipe_RW.c"\r
 #endif\r
 \r
        #include "Template/Template_Pipe_RW.c"\r
 #endif\r
 \r


@@ -185,7 +185,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))\r

        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r
        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE\r


@@ -194,7 +194,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr))\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))\r

        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r
        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE\r


@@ -203,7 +203,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            0\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())\r

        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r
        #include "Template/Template_Pipe_RW.c"\r
 \r
        #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE\r


@@ -212,7 +212,7 @@ uint8_t Pipe_Null_Stream(uint16_t Length,
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r
        #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()\r
        #define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)\r
        #define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount\r

-       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_Byte())\r
+       #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())\r

        #include "Template/Template_Pipe_RW.c"\r
 #endif\r
 \r
        #include "Template/Template_Pipe_RW.c"\r
 #endif\r
 \r