Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest...

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

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index b047841..9f419ad 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
 /* 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
 };\r
 \r
 \r


@@ -257,13 +257,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
        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
                        {\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
                        };\r
 \r
                /* Select the control pipe for the request transfer */\r


@@ -286,13 +286,13 @@ TASK(USB_HID_Host)
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r
        {\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
                                {\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
                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r