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.

6 files changed, 31 insertions, 30 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index d117bedf6..116921e6e 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -50,8 +50,7 @@ void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const Audio
 				

 				AudioInterfaceInfo->State.InterfaceEnabled = (USB_ControlRequest.wValue != 0);

 				  

-				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearIN();

+				Endpoint_ClearStatusStage();

 			}

 

 			break;

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 12b55938c..237e1dd2f 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -78,8 +78,7 @@ void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_Device_t* CDCInterfaceInf
 				

 				EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);

 

-				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearIN();

+				Endpoint_ClearStatusStage();

 			}

 	

 			break;

@@ -114,7 +113,7 @@ bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
 

 void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)

 {

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

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);

@@ -125,7 +124,12 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
 	if (!(Endpoint_IsReadWriteAllowed()))

 	{

 		Endpoint_ClearIN();

-		while (!(Endpoint_IsReadWriteAllowed()));

+

+		while (!(Endpoint_IsReadWriteAllowed()))

+		{

+			if (USB_DeviceState == DEVICE_STATE_Unattached)

+			  return;

+		}

 	}	

 	

 	Endpoint_ClearIN();

@@ -133,7 +137,7 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
 

 void CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, char* const Data, const uint16_t Length)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);

@@ -142,7 +146,7 @@ void CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, c
 

 void CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t Data)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);

@@ -150,7 +154,12 @@ void CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, con
 	if (!(Endpoint_IsReadWriteAllowed()))

 	{

 		Endpoint_ClearIN();

-		while (!(Endpoint_IsReadWriteAllowed()));

+		

+		while (!(Endpoint_IsReadWriteAllowed()))

+		{

+			if (USB_DeviceState == DEVICE_STATE_Unattached)

+			  return;		

+		}

 	}

 

 	Endpoint_Write_Byte(Data);	

@@ -165,7 +174,7 @@ uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterface
 

 uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return 0;

 

 	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);

@@ -180,7 +189,7 @@ uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
 

 void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber);

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index 4a6295ab0..f292c633e 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -88,8 +88,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
 				Endpoint_Write_Byte(HIDInterfaceInfo->State.UsingReportProtocol);

 				Endpoint_ClearIN();

 

-				while (!(Endpoint_IsOUTReceived()));

-				Endpoint_ClearOUT();

+				Endpoint_ClearStatusStage();

 			}

 			

 			break;

@@ -100,8 +99,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
 

 				HIDInterfaceInfo->State.UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);

 				

-				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearIN();

+				Endpoint_ClearStatusStage();

 			}

 			

 			break;

@@ -115,8 +113,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
 					

 					HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);

 					

-					while (!(Endpoint_IsINReady()));

-					Endpoint_ClearIN();

+					Endpoint_ClearStatusStage();

 				}

 			}

 			

@@ -129,8 +126,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
 				Endpoint_Write_Byte(HIDInterfaceInfo->State.IdleCount >> 2);

 				Endpoint_ClearIN();

 

-				while (!(Endpoint_IsOUTReceived()));

-				Endpoint_ClearOUT();

+				Endpoint_ClearStatusStage();

 			}

 

 			break;

@@ -152,7 +148,7 @@ bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfac
 		

 void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)

 {

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

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index da33bdb61..364327595 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -70,7 +70,7 @@ void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
 

 void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 	

 	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);

@@ -84,7 +84,7 @@ void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfac
 

 bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)

 {

-	if (!(USB_IsConnected))

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return false;

 	

 	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpointNumber);

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index f7f3fd9f2..9f8688c1d 100644
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -53,8 +53,7 @@ void MS_Device_ProcessControlPacket(USB_ClassInfo_MS_Device_t* const MSInterface
 

 				MSInterfaceInfo->State.IsMassStoreReset = true;			

 

-				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearIN();

+				Endpoint_ClearStatusStage();

 			}

 

 			break;

@@ -63,12 +62,10 @@ void MS_Device_ProcessControlPacket(USB_ClassInfo_MS_Device_t* const MSInterface
 			{

 				Endpoint_ClearSETUP();

 

-				Endpoint_Write_Byte(MSInterfaceInfo->Config.TotalLUNs - 1);

-				

+				Endpoint_Write_Byte(MSInterfaceInfo->Config.TotalLUNs - 1);				

 				Endpoint_ClearIN();

 				

-				while (!(Endpoint_IsOUTReceived()));

-				Endpoint_ClearOUT();

+				Endpoint_ClearStatusStage();

 			}

 			

 			break;

@@ -96,7 +93,7 @@ bool MS_Device_ConfigureEndpoints(USB_ClassInfo_MS_Device_t* const MSInterfaceIn
 

 void MS_Device_USBTask(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)

 {

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

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c
index 0d35ee6b4..37771c646 100644
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c
@@ -138,7 +138,7 @@ bool RNDIS_Device_ConfigureEndpoints(USB_ClassInfo_RNDIS_Device_t* const RNDISIn
 

 void RNDIS_Device_USBTask(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)

 {

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

+	if (USB_DeviceState != DEVICE_STATE_Configured)

 	  return;

 

 	RNDIS_Message_Header_t* MessageHeader = (RNDIS_Message_Header_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;