Fixed inability to enumerate any devices while in host mode (broken in a previous...

[pub/USBasp.git] / Demos / Device / GenericHID / GenericHID.c

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index a9ecfa7..695342d 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -40,11 +40,11 @@
 TASK_LIST\r
 {\r
        #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
 TASK_LIST\r
 {\r
        #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r

        #endif\r
        \r
        #if !defined(INTERRUPT_DATA_ENDPOINT)\r
        #endif\r
        \r
        #if !defined(INTERRUPT_DATA_ENDPOINT)\r

-       { Task: USB_HID_Report       , TaskStatus: TASK_STOP },\r
+       { .Task = USB_HID_Report       , .TaskStatus = TASK_STOP },\r

        #endif\r
 };\r
 \r
        #endif\r
 };\r
 \r


@@ -160,47 +160,47 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
        /* Handle HID Class specific requests */\r
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
        /* Handle HID Class specific requests */\r

-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r

        {\r
                case REQ_GetReport:\r
        {\r
                case REQ_GetReport:\r

-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               Endpoint_ClearControlSETUP();\r
-       \r

                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r

-                               \r
+\r
+                               Endpoint_ClearSETUP();\r
+       \r

                                CreateGenericHIDReport(GenericData);\r
 \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                CreateGenericHIDReport(GenericData);\r
 \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearControlOUT();\r
+                               Endpoint_ClearOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r

-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               Endpoint_ClearControlSETUP();\r
+                               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+\r
+                               Endpoint_ClearSETUP();\r

                                \r
                                /* Wait until the generic report has been sent by the host */\r
                                while (!(Endpoint_IsOUTReceived()));\r
 \r
                                \r
                                /* Wait until the generic report has been sent by the host */\r
                                while (!(Endpoint_IsOUTReceived()));\r
 \r

-                               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
-\r

                                Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r
                                Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r

-                               Endpoint_ClearControlOUT();\r
+                               Endpoint_ClearOUT();\r

 \r
                                /* Wait until the host is ready to receive the request confirmation */\r
                                while (!(Endpoint_IsINReady()));\r
                                \r
                                /* Handshake the request by sending an empty IN packet */\r
 \r
                                /* Wait until the host is ready to receive the request confirmation */\r
                                while (!(Endpoint_IsINReady()));\r
                                \r
                                /* Handshake the request by sending an empty IN packet */\r

-                               Endpoint_ClearControlIN();\r
+                               Endpoint_ClearIN();\r

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