Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions.

[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 941cf7c..65f490f 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.c
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
@@ -42,9 +42,17 @@
  */\r
 USB_ClassInfo_CDC_Host_t VirtualSerial_CDC_Interface =\r
        {\r
-               .DataINPipeNumber       = 1,\r
-               .DataOUTPipeNumber      = 2,\r
-               .NotificationPipeNumber = 3,\r
+               .Config =\r
+                       {\r
+                               .DataINPipeNumber       = 1,\r
+                               .DataOUTPipeNumber      = 2,\r
+                               .NotificationPipeNumber = 3,\r
+                       },\r
+                       \r
+               .State =\r
+                       {\r
+                               // Leave all state values to their defaults                     \r
+                       }\r
        };\r
        \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
@@ -54,13 +62,38 @@ int main(void)
 {\r
        SetupHardware();\r
 \r
-       puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
-              "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));\r
+       puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        for (;;)\r
        {\r
+               switch (USB_HostState)\r
+               {\r
+                       case HOST_STATE_Addressed:\r
+                               if (!(CDC_Host_ConfigurePipes(&VirtualSerial_CDC_Interface)))\r
+                               {\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+                               \r
+                               if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
+                               {\r
+                                       LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+                                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
+                                       break;\r
+                               }\r
+\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
                CDC_Host_USBTask(&VirtualSerial_CDC_Interface);\r
                USB_USBTask();\r
        }\r
@@ -113,8 +146,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {\r
        USB_ShutDown();\r
 \r
-       puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));\r
+       printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r
@@ -125,10 +158,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */\r
 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
 {\r
-       puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
+       puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
        printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
-       printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
+       printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);\r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r