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.

9 files changed, 84 insertions, 84 deletions

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/CDCHost/CDCHost.c
index a423b90eb..0068a5951 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.c
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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);

 }

@@ -154,8 +154,8 @@ void CDC_Host_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);

diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
index 33397b643..6d8601c5e 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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);

 }

@@ -255,8 +255,8 @@ void HID_Host_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 status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
index f40e7b9a0..386058426 100644
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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);

 }

@@ -216,8 +216,8 @@ void Keyboard_HID_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 status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -243,8 +243,8 @@ void Keyboard_HID_Task(void)
 			/* Send the request, display error and wait for device detach if request fails */

 			if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 			{

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

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

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

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
index ef73b77b0..db4032f6e 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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);

 }

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 60eb98a04..4f02e5128 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -107,8 +107,8 @@ void EVENT_USB_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(;;);

@@ -119,10 +119,10 @@ void EVENT_USB_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);

 }

@@ -160,8 +160,8 @@ void MassStorage_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);

diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.c b/Demos/Host/LowLevel/MouseHost/MouseHost.c
index 44147481b..f6a2f3820 100644
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.c
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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);

 }

@@ -215,8 +215,8 @@ void Mouse_HID_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 status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -242,8 +242,8 @@ void Mouse_HID_Task(void)
 			/* Send the request, display error and wait for device detach if request fails */

 			if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 			{

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

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

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

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
index b5b41ce67..31820be15 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
@@ -101,8 +101,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(;;);

@@ -113,10 +113,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 Mouse_HID_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);

@@ -171,8 +171,8 @@ void Mouse_HID_Task(void)
 			/* Get and process the device's first HID report descriptor */

 			if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)

 			{

-				puts_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"));

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

+				printf_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"

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

 			

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index bd84f19eb..b2b4059e9 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -101,8 +101,8 @@ void EVENT_USB_Host_HostError(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(;;);

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

 void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, 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);

 }

@@ -157,8 +157,8 @@ void USB_Printer_Host(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);

@@ -183,8 +183,8 @@ void USB_Printer_Host(void)
 					

 				if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 				{

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

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

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

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

 

 					/* Indicate error via status LEDs */

 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -200,8 +200,8 @@ void USB_Printer_Host(void)
 			char DeviceIDString[256];

 			if ((ErrorCode = Printer_GetDeviceID(DeviceIDString, sizeof(DeviceIDString))) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR(ESC_FG_RED "Control Error (Get DeviceID).\r\n"));

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

+				printf_P(PSTR(ESC_FG_RED "Control Error (Get DeviceID).\r\n"

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -231,8 +231,8 @@ void USB_Printer_Host(void)
 

 			if ((ErrorCode = Printer_SendData(&TestPageData)) != PIPE_RWSTREAM_NoError)

 			{

-				puts_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"));

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

+				printf_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

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