X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b5ca3990c2ec9dc240fb334002ed2f7c82eea853..e071f3897a0946c6be1e1b5e1f78eda8dcbf6fc7:/Demos/Host/LowLevel/CDCHost/CDCHost.c?ds=sidebyside

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/CDCHost/CDCHost.c
index e00332f9f..e20fa2cfc 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.c
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.c
@@ -43,8 +43,7 @@ int main(void)
 {
 	SetupHardware();
 
-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
-	       "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));
+	puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
 
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 
@@ -76,7 +75,7 @@ void SetupHardware(void)
  */
 void EVENT_USB_DeviceAttached(void)
 {
-	puts_P(PSTR("Device Attached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */
 void EVENT_USB_DeviceUnattached(void)
 {
-	puts_P(PSTR("\r\nDevice Unattached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {
 	USB_ShutDown();
 
-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
-	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
+	printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	for(;;);
@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */
 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
 {
-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
+	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"), USB_HostState);
+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
@@ -138,48 +137,49 @@ void CDC_Host_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
 			{
 				if (ErrorCode == ControlError)
-				  puts_P(PSTR("Control Error (Get Configuration).\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));
 				else
-				  puts_P(PSTR("Invalid Device.\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 				
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 			
 			/* 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("Control Error (Set Configuration).\r\n"));
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
-				
+
+			puts_P(PSTR("CDC Device Enumerated.\r\n"));
+
 			USB_HostState = HOST_STATE_Configured;
 			break;
 		case HOST_STATE_Configured:
-			puts_P(PSTR("CDC Device Enumerated.\r\n"));
-				
-			USB_HostState = HOST_STATE_Ready;
-			break;
-		case HOST_STATE_Ready:
 			/* Select and the data IN pipe */
 			Pipe_SelectPipe(CDC_DATAPIPE_IN);
+			Pipe_Unfreeze();
 
 			/* Check to see if a packet has been received */
 			if (Pipe_IsINReceived())
 			{
+				/* Re-freeze IN pipe after the packet has been received */
+				Pipe_Freeze();
+
 				/* Check if data is in the pipe */
 				if (Pipe_IsReadWriteAllowed())
 				{
@@ -199,6 +199,9 @@ void CDC_Host_Task(void)
 				Pipe_ClearIN();
 			}
 
+			/* Re-freeze IN pipe after use */
+			Pipe_Freeze();
+
 			/* Select and unfreeze the notification pipe */
 			Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);
 			Pipe_Unfreeze();