Moved USBtoSerial demo the Projects directory, as it is simply an expanded CDC demo. Added const qualifier to Endpoint/Pipe stream write routines.

7 files changed, 43 insertions, 21 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index 8b3922a4a..67e9457fd 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -208,60 +208,70 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 }

 

 #define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_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(*(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++))

 #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++))

 #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--))

 #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--))

 #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--))

 #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()

 #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())

 #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()

 #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())

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 183af21a9..4dfa1ef9b 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -795,7 +795,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Stream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().

 			 *

@@ -807,7 +807,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_EStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_EStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().

 			 *

@@ -821,7 +821,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_PStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_PStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** Writes the given number of bytes to the endpoint from the given buffer in big endian,

 			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;

@@ -844,7 +844,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Stream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().

 			 *

@@ -856,7 +856,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_EStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_EStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().

 			 *

@@ -870,7 +870,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_PStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_PStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** Reads the given number of bytes from the endpoint from the given buffer in little endian,

 			 *  discarding fully read packets from the host as needed. The last packet is not automatically

@@ -962,7 +962,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_Stream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.

 			 *

@@ -981,7 +981,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_EStream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_EStream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().

 			 *

@@ -1002,7 +1002,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_PStream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_PStream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,

 			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared

@@ -1024,7 +1024,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_Stream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().

 			 *

@@ -1043,7 +1043,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_EStream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_EStream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().

 			 *

@@ -1064,7 +1064,7 @@
 			 *

 			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Endpoint_Write_Control_PStream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Endpoint_Write_Control_PStream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,

 			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 400cc5f02..bc497ad3b 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -200,6 +200,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 }

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

@@ -207,6 +208,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

@@ -214,6 +216,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

@@ -221,6 +224,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

@@ -228,6 +232,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

@@ -235,6 +240,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE

+#define  TEMPLATE_BUFFER_TYPE                      const void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

@@ -242,6 +248,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE

+#define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

@@ -249,6 +256,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE

+#define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

@@ -256,6 +264,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE

+#define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

@@ -263,6 +272,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE

+#define  TEMPLATE_BUFFER_TYPE                      void*

 #define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 7178ab72e..4b7b900e9 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -854,7 +854,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_Stream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);				

+			uint8_t Pipe_Write_Stream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);				

 

 			/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().

 			 *

@@ -866,7 +866,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_EStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Pipe_Write_EStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 			

 			/** FLASH buffer source version of \ref Pipe_Write_Stream_LE().

 			 *

@@ -880,7 +880,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_PStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Pipe_Write_PStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 						

 			/** Writes the given number of bytes to the pipe from the given buffer in big endian,

 			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;

@@ -903,7 +903,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_Stream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Pipe_Write_Stream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().

 			 *

@@ -915,7 +915,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_EStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Pipe_Write_EStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 			

 			/** FLASH buffer source version of \ref Pipe_Write_Stream_BE().

 			 *

@@ -929,7 +929,7 @@
 			 *

 			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.

 			 */

-			uint8_t Pipe_Write_PStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

+			uint8_t Pipe_Write_PStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);

 

 			/** Reads the given number of bytes from the pipe into the given buffer in little endian,

 			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
index 6c1445ee0..ce402ad84 100644
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
@@ -1,4 +1,4 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)

+uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, uint16_t Length)

 {

 	uint8_t* DataStream     = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));

 	bool     LastPacketFull = false;

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
index b75344025..6e1f5b236 100644
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_RW.c
@@ -1,4 +1,4 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)

+uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer, uint16_t Length __CALLBACK_PARAM)

 {

 	uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));

 	uint8_t  ErrorCode;

@@ -71,6 +71,7 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
 }

 

 #undef TEMPLATE_FUNC_NAME

+#undef TEMPLATE_BUFFER_TYPE

 #undef TEMPLATE_TRANSFER_BYTE

 #undef TEMPLATE_CLEAR_ENDPOINT

 #undef TEMPLATE_BUFFER_OFFSET
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
index 3e09ac00b..ad8c4abeb 100644
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
@@ -1,4 +1,4 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)

+uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer, uint16_t Length __CALLBACK_PARAM)

 {

 	uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));

 	uint8_t  ErrorCode;

@@ -73,6 +73,7 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
 }

 

 #undef TEMPLATE_FUNC_NAME

+#undef TEMPLATE_BUFFER_TYPE

 #undef TEMPLATE_TOKEN

 #undef TEMPLATE_TRANSFER_BYTE

 #undef TEMPLATE_CLEAR_PIPE