State information for class drivers is now zeroed out during enumeration (both in...

[pub/USBasp.git] / Demos / Host / LowLevel / KeyboardHost / KeyboardHost.c

diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
index 64bcf09..1a53526 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
@@ -43,8 +43,7 @@ int main(void)
 {\r
        SetupHardware();\r
 \r
 {\r
        SetupHardware();\r
 \r

-       puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
-              "Keyboard HID Host Demo running.\r\n" ESC_INVERSE_OFF));\r
+       puts_P(PSTR(ESC_FG_CYAN "Keyboard HID Host Demo running.\r\n" ESC_FG_WHITE));\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r


@@ -76,7 +75,7 @@ void SetupHardware(void)
  */\r
 void EVENT_USB_DeviceAttached(void)\r
 {\r
  */\r
 void EVENT_USB_DeviceAttached(void)\r
 {\r

-       puts_P(PSTR("Device Attached.\r\n"));\r
+       puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));\r

        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r


@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */\r
 void EVENT_USB_DeviceUnattached(void)\r
 {\r
  */\r
 void EVENT_USB_DeviceUnattached(void)\r
 {\r

-       puts_P(PSTR("Device Unattached.\r\n"));\r
+       puts_P(PSTR(ESC_FG_GREEN "Device Unattached.\r\n" ESC_FG_WHITE));\r

        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r


@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {\r
        USB_ShutDown();\r
 \r
 {\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
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r


@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */\r
 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
 {\r
  */\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(" -- 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
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r


@@ -157,10 +156,7 @@ void ReadNextReport(void)
                if (KeyboardReport.KeyCode)\r
                {\r
                        /* Toggle status LED to indicate keypress */\r
                if (KeyboardReport.KeyCode)\r
                {\r
                        /* Toggle status LED to indicate keypress */\r

-                       if (LEDs_GetLEDs() & LEDS_LED2)\r
-                         LEDs_TurnOffLEDs(LEDS_LED2);\r
-                       else\r
-                         LEDs_TurnOnLEDs(LEDS_LED2);\r
+                       LEDs_ToggleLEDs(LEDS_LED2);\r

                                  \r
                        char PressedKey = 0;\r
 \r
                                  \r
                        char PressedKey = 0;\r
 \r


@@ -197,56 +193,40 @@ void Keyboard_HID_Task(void)
        switch (USB_HostState)\r
        {\r
                case HOST_STATE_Addressed:\r
        switch (USB_HostState)\r
        {\r
                case HOST_STATE_Addressed:\r

-                       /* Standard request to set the device configuration to configuration 1 */\r
-                       USB_ControlRequest = (USB_Request_Header_t)\r
-                               {\r
-                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       .bRequest      = REQ_SetConfiguration,\r
-                                       .wValue        = 1,\r
-                                       .wIndex        = 0,\r
-                                       .wLength       = 0,\r
-                               };\r
-\r
-                       /* Select the control pipe for the request transfer */\r
-                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-                       /* Send the request, display error and wait for device detach if request fails */\r
-                       if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+                       puts_P(PSTR("Getting Config Data.\r\n"));\r
+               \r
+                       /* Get and process the configuration descriptor data */\r
+                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r

                        {\r
                        {\r

-                               puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
+                               if (ErrorCode == ControlError)\r
+                                 puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));\r
+                               else\r
+                                 puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));\r

 \r
 \r

+                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r
+                               \r

                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                                break;\r
                        }\r

-                               \r
-                       USB_HostState = HOST_STATE_Configured;\r
-                       break;\r
-               case HOST_STATE_Configured:\r
-                       puts_P(PSTR("Getting Config Data.\r\n"));\r

                \r
                \r

-                       /* Get and process the configuration descriptor data */\r
-                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r
+                       /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
+                       if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r

                        {\r
                        {\r

-                               if (ErrorCode == ControlError)\r
-                                 puts_P(PSTR("Control Error (Get Configuration).\r\n"));\r
-                               else\r
-                                 puts_P(PSTR("Invalid Device.\r\n"));\r
+                               puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));\r
+                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
 \r

-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
-                               \r

                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                                break;\r
                        }\r

-               \r
+                               \r

                        /* HID class request to set the keyboard protocol to the Boot Protocol */\r
                        USB_ControlRequest = (USB_Request_Header_t)\r
                                {\r
                        /* HID class request to set the keyboard protocol to the Boot Protocol */\r
                        USB_ControlRequest = (USB_Request_Header_t)\r
                                {\r


@@ -263,22 +243,22 @@ void Keyboard_HID_Task(void)
                        /* Send the request, display error and wait for device detach if request fails */\r
                        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
                        {\r
                        /* Send the request, display error and wait for device detach if request fails */\r
                        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
                        {\r

-                               puts_P(PSTR("Control Error (Set Protocol).\r\n"));\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
+                               puts_P(PSTR(ESC_FG_RED "Control Error (Set Protocol).\r\n"));\r
+                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                \r
                                /* Wait until USB device disconnected */\r
 \r
                                /* Indicate error status */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r
                                break;\r
                        }\r
 \r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r

-                       USB_HostState = HOST_STATE_Ready;\r
+                       USB_HostState = HOST_STATE_Configured;\r

                        break;\r
                        break;\r

-               case HOST_STATE_Ready:\r
+               case HOST_STATE_Configured:\r

                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r