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.

1 files changed, 3 insertions, 8 deletions

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index 5cfaf46be..ca0771a94 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -166,14 +166,11 @@ void StillImage_Task(void)
 				break;

 			}

 				

+			puts_P(PSTR("Still Image Device Enumerated.\r\n"));

+

 			USB_HostState = HOST_STATE_Configured;

 			break;

 		case HOST_STATE_Configured:

-			puts_P(PSTR("Still Image Device Enumerated.\r\n"));

-				

-			USB_HostState = HOST_STATE_Ready;

-			break;

-		case HOST_STATE_Ready:

 			/* Indicate device busy via the status LEDs */

 			LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

 			

@@ -331,9 +328,7 @@ void StillImage_Task(void)
 			/* Indicate device no longer busy */

 			LEDs_SetAllLEDs(LEDMASK_USB_READY);

 			

-			/* Wait until USB device disconnected */

-			while (USB_IsConnected);

-			

+			USB_HostState = HOST_STATE_WaitForDeviceRemoval;

 			break;

 	}

 }