Removed interrupt disable/enable from the Device mode control request processing...

[pub/USBasp.git] / Demos / Host / ClassDriver / CDCHost / CDCHost.c

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.c b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
index 65f490f..0cbb771 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.c
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
@@ -48,12 +48,8 @@ USB_ClassInfo_CDC_Host_t VirtualSerial_CDC_Interface =
                                .DataOUTPipeNumber      = 2,\r
                                .NotificationPipeNumber = 3,\r
                        },\r
-                       \r
-               .State =\r
-                       {\r
-                               // Leave all state values to their defaults                     \r
-                       }\r
        };\r
+\r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  starts the scheduler to run the application tasks.\r
@@ -71,8 +67,26 @@ int main(void)
                switch (USB_HostState)\r
                {\r
                        case HOST_STATE_Addressed:\r
-                               if (!(CDC_Host_ConfigurePipes(&VirtualSerial_CDC_Interface)))\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+                       \r
+                               uint16_t ConfigDescriptorSize;\r
+                               uint8_t  ConfigDescriptorData[512];\r
+\r
+                               if ((USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful) ||\r
+                                   (ConfigDescriptorSize > sizeof(ConfigDescriptorData)))\r
+                               {\r
+                                       printf("Error Retrieving Configuration Descriptor.\r\n");\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                                 \r
+                               USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);\r
+\r
+                               if (CDC_Host_ConfigurePipes(&VirtualSerial_CDC_Interface,\r
+                                                           ConfigDescriptorSize, ConfigDescriptorData) != CDC_ENUMERROR_NoError)\r
                                {\r
+                                       printf("Attached Device Not a Valid CDC Class Device.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
@@ -80,17 +94,16 @@ int main(void)
                                \r
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                                {\r
+                                       printf("Error Setting Device Configuration.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r
-\r
+                               \r
+                               printf("CDC Device Enumerated.\r\n");\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
-                               USB_HostState = HOST_STATE_Ready;\r
-                               break;\r
-                       case HOST_STATE_Ready:\r
                                break;\r
                }\r
        \r