Fixed race condition when multiple SETUP messages queued.

Bootloaders/CDC/BootloaderCDC.c

@@ -219,13 +219,13 @@ void EVENT_USB_Device_ConfigurationChanged(void)
  *  the device from the USB host before passing along unhandled control requests to the library for processing
  *  internally.
  */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
 	/* Ignore any requests that aren't directed to the CDC interface */
 	if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
 	    (REQTYPE_CLASS | REQREC_INTERFACE))
 	{
-		return;
+		return 0;
 	}
 
 	/* Activity - toggle indicator LEDs */
@@ -242,6 +242,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				/* Write the line coding data to the control endpoint */
 				Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(CDC_LineEncoding_t));
 				Endpoint_ClearOUT();
+				return 1;
 			}
 
 			break;
@@ -253,6 +254,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				/* Read the line coding data in from the host into the global struct */
 				Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(CDC_LineEncoding_t));
 				Endpoint_ClearIN();
+				return 1;
 			}
 
 			break;
@@ -261,10 +263,12 @@ void EVENT_USB_Device_ControlRequest(void)
 	        {
 	            Endpoint_ClearSETUP();
 	            Endpoint_ClearStatusStage();
+	            return 1;
 	        }
 
 	        break;
 	}
+	return 0;
 }
 
 #if !defined(NO_BLOCK_SUPPORT)

Bootloaders/DFU/BootloaderDFU.c

@@ -247,13 +247,13 @@ ISR(TIMER1_OVF_vect, ISR_BLOCK)
  *  the device from the USB host before passing along unhandled control requests to the library for processing
  *  internally.
  */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
 	/* Ignore any requests that aren't directed to the DFU interface */
 	if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
 	    (REQTYPE_CLASS | REQREC_INTERFACE))
 	{
-		return;
+		return 0;
 	}
 
 	/* Activity - toggle indicator LEDs */
@@ -283,7 +283,7 @@ void EVENT_USB_Device_ControlRequest(void)
 				while (!(Endpoint_IsOUTReceived()))
 				{
 					if (USB_DeviceState == DEVICE_STATE_Unattached)
-					  return;
+					  return 0;
 				}
 
 				/* First byte of the data stage is the DNLOAD request's command */
@@ -415,6 +415,7 @@ void EVENT_USB_Device_ControlRequest(void)
 			Endpoint_ClearOUT();
 
 			Endpoint_ClearStatusStage();
+			return 1;
 
 			break;
 		case DFU_REQ_UPLOAD:
@@ -423,7 +424,7 @@ void EVENT_USB_Device_ControlRequest(void)
 			while (!(Endpoint_IsINReady()))
 			{
 				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
+				  return 0;
 			}
 
 			if (DFU_State != dfuUPLOAD_IDLE)
@@ -515,14 +516,15 @@ void EVENT_USB_Device_ControlRequest(void)
 			Endpoint_ClearIN();
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 		case DFU_REQ_GETSTATUS:
 			Endpoint_ClearSETUP();
 
 			while (!(Endpoint_IsINReady()))
 			{
 				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
+				  return 0;
 			}
 
 			/* Write 8-bit status value */
@@ -541,6 +543,7 @@ void EVENT_USB_Device_ControlRequest(void)
 			Endpoint_ClearIN();
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 		case DFU_REQ_CLRSTATUS:
 			Endpoint_ClearSETUP();
@@ -549,14 +552,15 @@ void EVENT_USB_Device_ControlRequest(void)
 			DFU_Status = OK;
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 		case DFU_REQ_GETSTATE:
 			Endpoint_ClearSETUP();
 
 			while (!(Endpoint_IsINReady()))
 			{
 				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
+				  return 0;
 			}
 
 			/* Write the current device state to the endpoint */
@@ -565,6 +569,7 @@ void EVENT_USB_Device_ControlRequest(void)
 			Endpoint_ClearIN();
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 		case DFU_REQ_ABORT:
 			Endpoint_ClearSETUP();
@@ -573,8 +578,10 @@ void EVENT_USB_Device_ControlRequest(void)
 			DFU_State = dfuIDLE;
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 	}
+	return 0;
 }
 
 /** Routine to discard the specified number of bytes from the control endpoint stream. This is used to

Bootloaders/DFU/BootloaderDFU.h

@@ -198,7 +198,7 @@
 		static void SetupHardware(void);
 		static void ResetHardware(void);
 
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 
 		#if defined(INCLUDE_FROM_BOOTLOADER_C)
 			static void DiscardFillerBytes(uint8_t NumberOfBytes);

Bootloaders/HID/BootloaderHID.c

@@ -119,13 +119,13 @@ void EVENT_USB_Device_ConfigurationChanged(void)
  *  the device from the USB host before passing along unhandled control requests to the library for processing
  *  internally.
  */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
 	/* Ignore any requests that aren't directed to the HID interface */
 	if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
 	    (REQTYPE_CLASS | REQREC_INTERFACE))
 	{
-		return;
+		return 0;
 	}
 
 	/* Process HID specific control requests */
@@ -184,7 +184,10 @@ void EVENT_USB_Device_ControlRequest(void)
 			Endpoint_ClearOUT();
 
 			Endpoint_ClearStatusStage();
+			return 1;
 			break;
 	}
+
+	return 0;
 }
 

Bootloaders/MassStorage/BootloaderMassStorage.c

@@ -239,9 +239,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	MS_Device_ProcessControlRequest(&Disk_MS_Interface);
+	return MS_Device_ProcessControlRequest(&Disk_MS_Interface);
 }
 
 /** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.

Bootloaders/MassStorage/BootloaderMassStorage.h

@@ -87,7 +87,7 @@
 		void EVENT_USB_Device_Connect(void) AUX_BOOT_SECTION;
 		void EVENT_USB_Device_Disconnect(void) AUX_BOOT_SECTION;
 		void EVENT_USB_Device_ConfigurationChanged(void) AUX_BOOT_SECTION;
-		void EVENT_USB_Device_ControlRequest(void) AUX_BOOT_SECTION;
+		int EVENT_USB_Device_ControlRequest(void) AUX_BOOT_SECTION;
 
 		bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) AUX_BOOT_SECTION;
 

Bootloaders/Printer/BootloaderPrinter.c

@@ -481,7 +481,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
  *  the device from the USB host before passing along unhandled control requests to the library for processing
  *  internally.
  */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	PRNT_Device_ProcessControlRequest(&TextOnly_Printer_Interface);
+	return PRNT_Device_ProcessControlRequest(&TextOnly_Printer_Interface);
 }

Bootloaders/Printer/BootloaderPrinter.h

@@ -102,7 +102,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 
 #endif
 

Demos/Device/ClassDriver/AudioInput/AudioInput.c

@@ -167,9 +167,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);
+	return Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);
 }
 
 /** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented

Demos/Device/ClassDriver/AudioInput/AudioInput.h

@@ -76,7 +76,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 
 		bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
 		                                                  const uint8_t EndpointProperty,

Demos/Device/ClassDriver/AudioOutput/AudioOutput.c

@@ -204,9 +204,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);
+	return Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);
 }
 
 /** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented

Demos/Device/ClassDriver/DualMIDI/DualMIDI.c

@@ -204,8 +204,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);
+	return MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);
 }
 

Demos/Device/ClassDriver/DualMIDI/DualMIDI.h

@@ -72,7 +72,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 
 #endif
 

Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c

@@ -210,10 +210,16 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);
-	CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);
+	int request_handled;
+
+	request_handled = CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);
+	if (!request_handled) {
+		request_handled = CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);
+	}
+
+	return request_handled;
 }
 
 /** CDC class driver callback function the processing of changes to the virtual

Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h

@@ -70,7 +70,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 
 #endif
 

Demos/Device/ClassDriver/GenericHID/GenericHID.c

@@ -129,9 +129,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	HID_Device_ProcessControlRequest(&Generic_HID_Interface);
+	return HID_Device_ProcessControlRequest(&Generic_HID_Interface);
 }
 
 /** Event handler for the USB device Start Of Frame event. */

Demos/Device/ClassDriver/GenericHID/GenericHID.h

@@ -69,7 +69,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 		void EVENT_USB_Device_StartOfFrame(void);
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,

Demos/Device/ClassDriver/Joystick/Joystick.c

@@ -131,9 +131,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	HID_Device_ProcessControlRequest(&Joystick_HID_Interface);
+	return HID_Device_ProcessControlRequest(&Joystick_HID_Interface);
 }
 
 /** Event handler for the USB device Start Of Frame event. */

Demos/Device/ClassDriver/Joystick/Joystick.h

@@ -82,7 +82,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 		void EVENT_USB_Device_StartOfFrame(void);
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,

Demos/Device/ClassDriver/Keyboard/Keyboard.c

@@ -131,9 +131,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
+	return HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
 }
 
 /** Event handler for the USB device Start Of Frame event. */

Demos/Device/ClassDriver/Keyboard/Keyboard.h

@@ -71,7 +71,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 		void EVENT_USB_Device_StartOfFrame(void);
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,

Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c

@@ -157,10 +157,16 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+int EVENT_USB_Device_ControlRequest(void)
 {
-	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
-	HID_Device_ProcessControlRequest(&Mouse_HID_Interface);
+	int request_handled;
+
+	request_handled = HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
+	if (!request_handled) {
+		request_handled = HID_Device_ProcessControlRequest(&Mouse_HID_Interface);
+	}
+
+	return request_handled;
 }
 
 /** Event handler for the USB device Start Of Frame event. */

Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h

@@ -66,7 +66,7 @@
 		void EVENT_USB_Device_Connect(void);
 		void EVENT_USB_Device_Disconnect(void);
 		void EVENT_USB_Device_ConfigurationChanged(void);
-		void EVENT_USB_Device_ControlRequest(void);
+		int EVENT_USB_Device_ControlRequest(void);
 		void EVENT_USB_Device_StartOfFrame(void);
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,