Fixed PrinterHost demo Printer_GetDeviceID() routine not removing the Device ID string length from the start of the returned array (thanks to John Andrews).

Fixed error in new pipe stream function template system not setting the right device token for R/W operations (also thanks to John Andrews).

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@663 d5102386-fcda-11dd-9fdb-3debd5008f28

3 files changed, 20 insertions, 9 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
index a271c06c..42e3262f 100644
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -58,7 +58,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 

 	Pipe_ClearSETUP();

 	

-	if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)))

+	if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)

 	  goto End_Of_Control_Send;

 

 	Pipe_Freeze();

@@ -76,7 +76,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 			{

 				Pipe_Unfreeze();

 

-				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)))

+				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)

 				  goto End_Of_Control_Send;

 							

 				if (!(Pipe_BytesInPipe()))

@@ -96,12 +96,12 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 		Pipe_SetToken(PIPE_TOKEN_OUT);

 		Pipe_Unfreeze();

 		

-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)))

+		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)

 		  goto End_Of_Control_Send;

 

 		Pipe_ClearOUT();

 

-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)))

+		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)

 		  goto End_Of_Control_Send;

 	}

 	else

@@ -113,7 +113,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 

 			while (DataLen)

 			{

-				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)))

+				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)

 				  goto End_Of_Control_Send;

 

 				while (DataLen && (Pipe_BytesInPipe() < USB_ControlPipeSize))

@@ -125,7 +125,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 				Pipe_ClearOUT();

 			}

 

-			if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)))

+			if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)

 			  goto End_Of_Control_Send;

 

 			Pipe_Freeze();

@@ -134,7 +134,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 		Pipe_SetToken(PIPE_TOKEN_IN);

 		Pipe_Unfreeze();

 

-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)))

+		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)

 		  goto End_Of_Control_Send;

 

 		Pipe_ClearIN();

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 18fbc19b..3fb30a2f 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -184,60 +184,70 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 }

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(*(BufferPtr++))

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte(BufferPtr++))

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte(BufferPtr++))

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

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

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

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

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

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

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *(BufferPtr++) = Pipe_Read_Byte()

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            0

 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte(BufferPtr++, Pipe_Read_Byte())

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

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

 #include "Template/Template_Pipe_RW.c"

 

 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE

+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN

 #define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()

 #define  TEMPLATE_BUFFER_OFFSET(Length)            Length - 1

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

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
index f36f82da..4250d613 100644
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c
@@ -3,7 +3,7 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length _CALLBACK_PARAM)
 	uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));

 	uint8_t  ErrorCode;

 	

-	Pipe_SetToken(PIPE_TOKEN_IN);

+	Pipe_SetToken(TEMPLATE_TOKEN);

 

 	if ((ErrorCode = Pipe_WaitUntilReady()))

 	  return ErrorCode;

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

 

 #undef TEMPLATE_FUNC_NAME

+#undef TEMPLATE_TOKEN

 #undef TEMPLATE_TRANSFER_BYTE

 #undef TEMPLATE_CLEAR_PIPE

-#undef TEMPLATE_BUFFER_OFFSET
\ No newline at end of file
+#undef TEMPLATE_BUFFER_OFFSET