Make Endpoint control transfers more reliable; early-abort when an incomplete packet is sent from the host (indicating end of transfer), add check for control reads to ensure that no more than wLength bytes are read from the interface.

Condense sequential printf_P/puts_P calls to single printf_P calls for size and clarity.

1 files changed, 10 insertions, 10 deletions

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index 6c56d5f3e..fb768fdaa 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -102,8 +102,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

-	printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);

+	printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"

+	                         " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +114,10 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

-	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);

-	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

+	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"

+	                         " -- Error Code %d\r\n"

+	                         " -- Sub Error Code %d\r\n"

+	                         " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -155,8 +155,8 @@ void StillImage_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));

-				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);

+				printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"

+				                         " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -367,8 +367,8 @@ void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)
 {

 	char* FailureType = ((ResponseCodeError) ? PSTR("Response Code != OK") : PSTR("Transaction Fail"));

 

-	printf_P(PSTR(ESC_FG_RED "Command Error (%S).\r\n"), FailureType);

-	printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);

+	printf_P(PSTR(ESC_FG_RED "Command Error (%S).\r\n"

+	                         " -- Error Code %d\r\n" ESC_FG_WHITE), FailureType, ErrorCode);

 			

 	/* Indicate error via status LEDs */

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);