Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / Webserver / USBHostMode.c

diff --git a/Projects/Webserver/USBHostMode.c b/Projects/Webserver/USBHostMode.c
index 941ebba..1620cb5 100644 (file)
--- a/Projects/Webserver/USBHostMode.c
+++ b/Projects/Webserver/USBHostMode.c
@@ -40,7 +40,7 @@
  *  passed to all RNDIS Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */
  *  passed to all RNDIS Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */

-USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface =
+USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface_Host =

        {
                .Config =
                        {
        {
                .Config =
                        {


@@ -66,74 +66,9 @@ void USBHostMode_USBTask(void)
        if (USB_CurrentMode != USB_MODE_Host)
          return;
 
        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,
-                                                                                 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_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, 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, 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;
-       }
-
-       RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface);
+       uIPManagement_ManageNetwork();
+       
+       RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface_Host);

 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and


@@ -157,6 +92,58 @@ void EVENT_USB_Host_DeviceUnattached(void)
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(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);
+               USB_Host_SetDeviceConfiguration(0);
+               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);
+               USB_Host_SetDeviceConfiguration(0);
+               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);
+               USB_Host_SetDeviceConfiguration(0);
+               return;
+       }
+
+       /* Initialize uIP stack */
+       uIPManagement_Init();
+

        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }