Create a new function pointer type in StreamCallbacks.h for endpoint/pipe stream...

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

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index b047841..580612c 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.c
@@ -39,8 +39,8 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
-       { Task: USB_HID_Host         , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_HID_Host         , .TaskStatus = TASK_STOP },\r
 };\r
 \r
 \r
@@ -182,10 +182,8 @@ void ReadNextReport(void)
        /* 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
@@ -208,10 +206,8 @@ void ReadNextReport(void)
        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
        \r
-       #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze HID data IN pipe */\r
        Pipe_Freeze();\r
-       #endif\r
 }\r
 \r
 /** Writes a report to the attached device.\r
@@ -257,13 +253,13 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
        else\r
        {\r
                /* Class specific request to send a HID report to the device */\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_SetReport,\r
-                               wValue:        ((ReportType << 8) | ReportIndex),\r
-                               wIndex:        0,\r
-                               wLength:       ReportLength,\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                               .bRequest      = REQ_SetReport,\r
+                               .wValue        = ((ReportType << 8) | ReportIndex),\r
+                               .wIndex        = 0,\r
+                               .wLength       = ReportLength,\r
                        };\r
 \r
                /* Select the control pipe for the request transfer */\r
@@ -286,13 +282,13 @@ TASK(USB_HID_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
@@ -335,53 +331,13 @@ TASK(USB_HID_Host)
                                break;\r
                        }\r
                \r
-                       #if defined(INTERRUPT_DATA_PIPE)                                        \r
-                       /* Select and unfreeze HID data IN pipe */\r
-                       Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
-                       Pipe_Unfreeze();\r
-                       #endif\r
-\r
                        puts_P(PSTR("HID Device Enumerated.\r\n"));\r
                                        \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
-               #if !defined(INTERRUPT_DATA_PIPE)\r
                case HOST_STATE_Ready:\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 HID data IN pipe has caused the interrupt */\r
-       if (Pipe_HasPipeInterrupted(HID_DATA_IN_PIPE))\r
-       {\r
-               /* Clear the pipe interrupt, and select the data IN pipe */\r
-               Pipe_ClearPipeInterrupt(HID_DATA_IN_PIPE);\r
-               Pipe_SelectPipe(HID_DATA_IN_PIPE);      \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
-\r
-       /* Restore previously selected pipe */\r
-       Pipe_SelectPipe(PrevSelectedPipe);\r
 }\r
-#endif\r