Update CDC Class Driver character stream functions to use the correct avr-libc return codes for errors and EOF.

Fix pointer arithmetic on void byte buffers by explicitly typecasting the buffer pointers to uint8_t* before altering them.

1 files changed, 20 insertions, 20 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index 67e9457fd..6d59510b8 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -211,122 +211,122 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE

 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE

 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE

 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE

 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE

 #define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Endpoint_Read_Byte()

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr++, Endpoint_Read_Byte())

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Endpoint_Read_Byte()

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE

 #define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr--, Endpoint_Read_Byte())

 #include "Template/Template_Endpoint_RW.c"

 

 #endif

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(*((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))

 #include "Template/Template_Endpoint_Control_W.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Endpoint_Read_Byte()

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_Control_R.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr++, Endpoint_Read_Byte())

 #include "Template/Template_Endpoint_Control_R.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr--) = Endpoint_Read_Byte()

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Endpoint_Read_Byte()

 #include "Template/Template_Endpoint_Control_R.c"

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())

+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr--, Endpoint_Read_Byte())

 #include "Template/Template_Endpoint_Control_R.c"

 

 #endif