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, 22 insertions, 17 deletions

diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.c b/Demos/Device/LowLevel/DualCDC/DualCDC.c
index 862945e63..dd278d535 100644
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.c
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.c
@@ -211,9 +211,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

 				

-				/* Acknowledge status stage */

-				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearIN();

+				Endpoint_ClearStatusStage();

 			}

 	

 			break;

@@ -228,20 +226,19 @@ void CDC1_Task(void)
 	char*       ReportString    = NULL;

 	uint8_t     JoyStatus_LCL   = Joystick_GetStatus();

 	static bool ActionSent      = false;

-

+	char*       JoystickStrings[] =

+					{

+						"Joystick Up\r\n",

+						"Joystick Down\r\n",

+						"Joystick Left\r\n",

+						"Joystick Right\r\n",

+						"Joystick Pressed\r\n",

+					};

+	

 	/* Device must be connected and configured for the task to run */

-	if (!(USB_IsConnected) || !(USB_ConfigurationNumber))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

-	char* JoystickStrings[] =

-		{

-			"Joystick Up\r\n",

-			"Joystick Down\r\n",

-			"Joystick Left\r\n",

-			"Joystick Right\r\n",

-			"Joystick Pressed\r\n",

-		};

-

 	/* Determine if a joystick action has occurred */

 	if (JoyStatus_LCL & JOY_UP)

 	  ReportString = JoystickStrings[0];

@@ -273,7 +270,11 @@ void CDC1_Task(void)
 		Endpoint_ClearIN();

 

 		/* Wait until the endpoint is ready for another packet */

-		while (!(Endpoint_IsINReady()));

+		while (!(Endpoint_IsINReady()))

+		{

+			if (USB_DeviceState == DEVICE_STATE_Unattached)

+			  return;

+		}

 		

 		/* Send an empty packet to ensure that the host does not buffer data sent to it */

 		Endpoint_ClearIN();

@@ -293,7 +294,7 @@ void CDC1_Task(void)
 void CDC2_Task(void)

 {

 	/* Device must be connected and configured for the task to run */

-	if (!(USB_IsConnected) || !(USB_ConfigurationNumber))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	/* Select the Serial Rx Endpoint */

@@ -324,7 +325,11 @@ void CDC2_Task(void)
 		Endpoint_ClearIN();

 

 		/* Wait until the endpoint is ready for the next packet */

-		while (!(Endpoint_IsINReady()));

+		while (!(Endpoint_IsINReady()))

+		{

+			if (USB_DeviceState == DEVICE_STATE_Unattached)

+			  return;

+		}

 

 		/* Send an empty packet to prevent host buffering */

 		Endpoint_ClearIN();