Updated all host mode demos and projects to use the EVENT_USB_Host_DeviceEnumerationComplete() event callback for device configuration instead of manual host state machine manipulations in the main application task.

Added new USB_Host_ConfigurationNumber global variable to indicate the selected configuration in an attached device.

Renamed global state variables that are specific to a certain USB mode to clearly indicate which mode the variable relates to, by changing the USB_* prefix to USB_Device_* or USB_Host_*.

Removed the HOST_STATE_WaitForDeviceRemoval and HOST_STATE_Suspended host state machine states, as these are no longer required.

Altered the USB_Host_SetDeviceConfiguration() function to update the new USB_Host_ConfigurationNumber global as required.

Moved out the Host mode standard request convenience/helper functions from the architecture specific Host driver files to the architecture agnostic HostStandardReq.c driver file.

6 files changed, 133 insertions, 171 deletions

diff --git a/Projects/HIDReportViewer/HIDReportViewer.c b/Projects/HIDReportViewer/HIDReportViewer.c
index 49f81f2a6..c7a73e761 100644
--- a/Projects/HIDReportViewer/HIDReportViewer.c
+++ b/Projects/HIDReportViewer/HIDReportViewer.c
@@ -74,68 +74,30 @@ int main(void)
 

 	for (;;)

 	{

-		switch (USB_HostState)

-		{

-			case HOST_STATE_Addressed:

-				LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

-

-				uint16_t ConfigDescriptorSize;

-				uint8_t  ConfigDescriptorData[512];

-

-				if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,

-				                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)

-				{

-					puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));

-					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-					USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-					break;

-				}

-

-				if (HID_Host_ConfigurePipes(&Device_HID_Interface,

-				                            ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)

-				{

-					puts_P(PSTR("Attached Device Not a Valid HID Device.\r\n"));

-					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-					USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-					break;

-				}

-

-				if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)

-				{

-					puts_P(PSTR("Error Setting Device Configuration.\r\n"));

-					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-					USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-					break;

-				}

-

-				if (HID_Host_SetReportProtocol(&Device_HID_Interface) != 0)

-				{

-					puts_P(PSTR("Error Setting Report Protocol Mode.\r\n"));

-					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-					USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-					break;

-				}

-

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

-				LEDs_SetAllLEDs(LEDMASK_USB_READY);

-				USB_HostState = HOST_STATE_Configured;

-				break;

-			case HOST_STATE_Configured:

-				LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

-				

-				OutputReportSizes();

-				OutputParsedReportItems();

-				

-				LEDs_SetAllLEDs(LEDMASK_USB_READY);

-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;

-				break;

-		}

-

+		RetrieveDeviceData();

+		

 		HID_Host_USBTask(&Device_HID_Interface);

 		USB_USBTask();

 	}

 }

 

+/** Task to retrieve the HID device information from an attached device, and output

+ *  the relevant data to the serial port for analysis.

+ */

+void RetrieveDeviceData(void)

+{

+	if (USB_CurrentMode != USB_MODE_Host)

+	  return;

+	

+	LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

+	

+	OutputReportSizes();

+	OutputParsedReportItems();

+	

+	LEDs_SetAllLEDs(LEDMASK_USB_READY);

+	USB_Host_SetDeviceConfiguration(0);

+}

+

 /** Prints a summary of the device's HID report sizes from the HID parser output to the serial port

  *  for display to the user.

  */

@@ -276,6 +238,43 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */

 void EVENT_USB_Host_DeviceEnumerationComplete(void)

 {

+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

+

+	uint16_t ConfigDescriptorSize;

+	uint8_t  ConfigDescriptorData[512];

+

+	if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,

+	                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)

+	{

+		puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));

+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+		return;

+	}

+

+	if (HID_Host_ConfigurePipes(&Device_HID_Interface,

+	                            ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)

+	{

+		puts_P(PSTR("Attached Device Not a Valid HID Device.\r\n"));

+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+		return;

+	}

+

+	if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)

+	{

+		puts_P(PSTR("Error Setting Device Configuration.\r\n"));

+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+		return;

+	}

+

+	if (HID_Host_SetReportProtocol(&Device_HID_Interface) != 0)

+	{

+		puts_P(PSTR("Error Setting Report Protocol Mode.\r\n"));

+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+		USB_Host_SetDeviceConfiguration(0);

+		return;

+	}

+

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

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

 

diff --git a/Projects/HIDReportViewer/HIDReportViewer.h b/Projects/HIDReportViewer/HIDReportViewer.h
index ff2512b90..ea8b6b938 100644
--- a/Projects/HIDReportViewer/HIDReportViewer.h
+++ b/Projects/HIDReportViewer/HIDReportViewer.h
@@ -69,6 +69,7 @@
 

 	/* Function Prototypes: */

 		void SetupHardware(void);

+		void RetrieveDeviceData(void);

 		void OutputReportSizes(void);

 		void OutputParsedReportItems(void);

 		void OutputCollectionPath(const HID_CollectionPath_t* const CollectionPath);

diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c
index 6a98b5459..e143bec72 100644
--- a/Projects/MissileLauncher/MissileLauncher.c
+++ b/Projects/MissileLauncher/MissileLauncher.c
@@ -103,8 +103,8 @@ int main(void)
 	for (;;)
 	{
 		Read_Joystick_Status();
-
-		HID_Host_Task();
+		DiscardNextReport();
+		
 		USB_USBTask();
 	}
 }
@@ -198,6 +198,22 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+
+	/* Get and process the configuration descriptor data */
+	if (ProcessConfigurationDescriptor() != SuccessfulConfigRead)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
+	if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
@@ -222,6 +238,9 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
 /** Reads in and discards the next report from the attached device. */
 void DiscardNextReport(void)
 {
+	if (USB_HostState != HOST_STATE_Configured)
+	  return;
+
 	/* Select and unfreeze HID data IN pipe */
 	Pipe_SelectPipe(HID_DATA_IN_PIPE);
 	Pipe_Unfreeze();
@@ -250,6 +269,9 @@ void DiscardNextReport(void)
 void WriteNextReport(uint8_t* const ReportOUTData,
                      const uint16_t ReportLength)
 {
+	if (USB_HostState != HOST_STATE_Configured)
+	  return;
+
 	/* Select and unfreeze HID data OUT pipe */
 	Pipe_SelectPipe(HID_DATA_OUT_PIPE);
 
@@ -297,45 +319,3 @@ void WriteNextReport(uint8_t* const ReportOUTData,
 	}
 }
 
-/** Task to set the configuration of the attached device after it has been enumerated, and to read and process
- *  HID reports from the device and to send reports if desired.
- */
-void HID_Host_Task(void)
-{
-	uint8_t ErrorCode;
-
-	/* Switch to determine what user-application handled host state the host state machine is in */
-	switch (USB_HostState)
-	{
-		case HOST_STATE_Addressed:
-			/* Get and process the configuration descriptor data */
-			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
-			{
-				/* Indicate error status */
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-				/* Wait until USB device disconnected */
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
-			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
-			{
-				/* Indicate error status */
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-
-				/* Wait until USB device disconnected */
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			USB_HostState = HOST_STATE_Configured;
-			break;
-		case HOST_STATE_Configured:
-			DiscardNextReport();
-
-			break;
-	}
-}
-
diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h
index 7363f0fab..0cdd1a2f8 100644
--- a/Projects/MissileLauncher/MissileLauncher.h
+++ b/Projects/MissileLauncher/MissileLauncher.h
@@ -77,8 +77,6 @@
 		                         const uint16_t ReportSize);
         void Send_Command(const uint8_t* const Command);
 
-		void HID_Host_Task(void);
-
 		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
 		void EVENT_USB_Host_DeviceAttached(void);
 		void EVENT_USB_Host_DeviceUnattached(void);
diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c
index c0ffcd4a3..5e0a3082e 100644
--- a/Projects/Webserver/Lib/uIPManagement.c
+++ b/Projects/Webserver/Lib/uIPManagement.c
@@ -113,7 +113,7 @@ void uIPManagement_Init(void)
  */
 void uIPManagement_ManageNetwork(void)
 {
-	if (((USB_CurrentMode == USB_MODE_Host) && (USB_HostState == HOST_STATE_Configured)) ||
+	if (((USB_CurrentMode == USB_MODE_Host)   && (USB_HostState   == HOST_STATE_Configured)) ||
 	    ((USB_CurrentMode == USB_MODE_Device) && (USB_DeviceState == DEVICE_STATE_Configured)))
 	{
 		uIPManagement_ProcessIncomingPacket();
diff --git a/Projects/Webserver/USBHostMode.c b/Projects/Webserver/USBHostMode.c
index 1fcec3491..98467a1bb 100644
--- a/Projects/Webserver/USBHostMode.c
+++ b/Projects/Webserver/USBHostMode.c
@@ -66,73 +66,8 @@ void USBHostMode_USBTask(void)
 	if (USB_CurrentMode != USB_MODE_Host)
 	  return;
 
-	switch (USB_HostState)
-	{
-		case HOST_STATE_Addressed:
-			LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
-
-			uint16_t ConfigDescriptorSize;
-			uint8_t  ConfigDescriptorData[512];
-
-			if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
-												   sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface_Host,
-										  ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface_Host) != HOST_SENDCONTROL_Successful)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST);
-			if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_GEN_CURRENT_PACKET_FILTER,
-											&PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_802_3_CURRENT_ADDRESS,
-											  &MACAddress, sizeof(MACAddress)) != HOST_SENDCONTROL_Successful)
-			{
-				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				break;
-			}
-
-			/* Initialize uIP stack */
-			uIPManagement_Init();
-
-			LEDs_SetAllLEDs(LEDMASK_USB_READY);
-			USB_HostState = HOST_STATE_Configured;
-			break;
-		case HOST_STATE_Configured:
-			uIPManagement_ManageNetwork();
-
-			break;
-	}
-
+	uIPManagement_ManageNetwork();
+	
 	RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface_Host);
 }
 
@@ -157,6 +92,55 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+
+	uint16_t ConfigDescriptorSize;
+	uint8_t  ConfigDescriptorData[512];
+
+	if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
+	                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface_Host,
+	                              ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface_Host) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST);
+	if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_GEN_CURRENT_PACKET_FILTER,
+	                                &PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface_Host, OID_802_3_CURRENT_ADDRESS,
+	                                  &MACAddress, sizeof(MACAddress)) != HOST_SENDCONTROL_Successful)
+	{
+		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+		return;
+	}
+
+	/* Initialize uIP stack */
+	uIPManagement_Init();
+
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }