Fixed CDCHost not clearing configured endpoints and resetting configured endpoints...

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

diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c
index 35055ca..628a273 100644 (file)
--- a/Demos/Host/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/KeyboardHost/KeyboardHost.c
@@ -39,8 +39,8 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
-       { Task: USB_Keyboard_Host    , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_Keyboard_Host    , .TaskStatus = TASK_STOP },\r
 };\r
 \r
 \r
@@ -180,18 +180,14 @@ void ReadNextReport(void)
        /* Select keyboard data pipe */\r
        Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
 \r
-       #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Unfreeze keyboard data pipe */\r
        Pipe_Unfreeze();\r
-       #endif\r
 \r
        /* Check to see if a packet has been received */\r
        if (!(Pipe_IsINReceived()))\r
        {\r
-               #if !defined(INTERRUPT_DATA_PIPE)\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
-               #endif\r
                        \r
                return;\r
        }\r
@@ -231,15 +227,12 @@ void ReadNextReport(void)
                          putchar(PressedKey);\r
                }\r
        }\r
-       \r
-                                               \r
+               \r
        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
 \r
-       #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze keyboard data pipe */\r
        Pipe_Freeze();\r
-       #endif\r
 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
@@ -253,13 +246,13 @@ TASK(USB_Keyboard_Host)
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r
-                       USB_HostRequest = (USB_Host_Request_Header_t)\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
+                                       .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
@@ -303,13 +296,13 @@ TASK(USB_Keyboard_Host)
                        }\r
                \r
                        /* HID class request to set the keyboard protocol to the Boot Protocol */\r
-                       USB_HostRequest = (USB_Host_Request_Header_t)\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r
                                {\r
-                                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                                       bRequest:      REQ_SetProtocol,\r
-                                       wValue:        0,\r
-                                       wIndex:        0,\r
-                                       wLength:       0,\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                                       .bRequest      = REQ_SetProtocol,\r
+                                       .wValue        = 0,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r
                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r
@@ -329,53 +322,14 @@ TASK(USB_Keyboard_Host)
                                break;\r
                        }\r
 \r
-                       #if defined(INTERRUPT_DATA_PIPE)                        \r
-                       /* Select and unfreeze keyboard data pipe */\r
-                       Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
-                       Pipe_Unfreeze();\r
-                       #endif\r
-\r
                        puts_P(PSTR("Keyboard Enumerated.\r\n"));\r
 \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
-               #if !defined(INTERRUPT_DATA_PIPE)\r
                case HOST_STATE_Ready:\r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        break;\r
-               #endif\r
        }\r
 }\r
-\r
-#if defined(INTERRUPT_DATA_PIPE)\r
-/** Interrupt handler for the Endpoint/Pipe interrupt vector. This interrupt fires each time an enabled\r
- *  pipe interrupt occurs on a pipe which has had that interrupt enabled.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       /* Save previously selected pipe before selecting a new pipe */\r
-       uint8_t PrevSelectedPipe = Pipe_GetCurrentPipe();\r
-\r
-       /* Check to see if the keyboard data pipe has caused the interrupt */\r
-       if (Pipe_HasPipeInterrupted(KEYBOARD_DATAPIPE))\r
-       {\r
-               /* Clear the pipe interrupt, and select the keyboard pipe */\r
-               Pipe_ClearPipeInterrupt(KEYBOARD_DATAPIPE);\r
-               Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
-\r
-               /* Check to see if the pipe IN interrupt has fired */\r
-               if (USB_INT_HasOccurred(PIPE_INT_IN) && USB_INT_IsEnabled(PIPE_INT_IN))\r
-               {\r
-                       /* Clear interrupt flag */\r
-                       USB_INT_Clear(PIPE_INT_IN);             \r
-\r
-                       /* Read and process the next report from the device */\r
-                       ReadNextReport();\r
-       }\r
-       \r
-       /* Restore previously selected pipe */\r
-       Pipe_SelectPipe(PrevSelectedPipe);\r
-}\r
-#endif\r