Added new USB_DeviceState variable to keep track of the current Device mode USB state.

Added new Endpoint_ClearStatusStage() convenience function to assist with the status stages of control transfers.

Removed vague USB_IsConnected global - test USB_DeviceState or USB_HostState explicitly to gain previous functionality.

Removed USB_IsSuspended global - test USB_DeviceState against DEVICE_STATE_Suspended instead.

Fixed possible enumeration errors from spinloops which may fail to exit if the USB connection is severed before the exit condition becomes true.

2 files changed, 8 insertions, 7 deletions

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
index 4c88bb4f2..cb051cdf1 100644
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -54,7 +54,11 @@ uint8_t Printer_SendData(Printer_Data_t* PrinterCommands)
 	  return ErrorCode;

 

 	Pipe_ClearOUT();

-	while (!(Pipe_IsOUTReady()));

+	while (!(Pipe_IsOUTReady()))

+	{

+		if (USB_HostState == HOST_STATE_Unattached)

+		  return PIPE_RWSTREAM_DeviceDisconnected;

+	}

 	

 	Pipe_Freeze();

 

diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index 3b145a63d..bbda0c24b 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -195,9 +195,6 @@ void USB_Printer_Host(void)
 				}

 			}

 			

-			USB_HostState = HOST_STATE_Configured;

-			break;

-		case HOST_STATE_Configured:

 			puts_P(PSTR("Retrieving Device ID...\r\n"));

 		

 			char DeviceIDString[256];

@@ -217,10 +214,10 @@ void USB_Printer_Host(void)
 			printf_P(PSTR("Printer Device ID: %s\r\n"), DeviceIDString);

 

 			puts_P(PSTR("Printer Enumerated.\r\n"));

-					

-			USB_HostState = HOST_STATE_Ready;

+

+			USB_HostState = HOST_STATE_Configured;

 			break;

-		case HOST_STATE_Ready:

+		case HOST_STATE_Configured:

 			/* Indicate device busy via the status LEDs */

 			LEDs_SetAllLEDs(LEDMASK_USB_BUSY);