Minor cleanups to DualCDC ClassDriver device demo for clarity.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / HID.c

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index 0699218..43f11ee 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -28,15 +28,21 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r

 #include "HID.h"\r
 \r
 #include "HID.h"\r
 \r

-void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r

-       if (USB_ControlRequest.wIndex != HIDInterfaceInfo->InterfaceNumber)\r
-         return;\r
+       if ((USB_ControlRequest.wIndex   != HIDInterfaceInfo->Config.InterfaceNumber) &&\r
+           (USB_ControlRequest.bRequest != REQ_SetIdle))\r
+       {\r
+               return;\r
+       }\r

 \r
        switch (USB_ControlRequest.bRequest)\r
        {\r
 \r
        switch (USB_ControlRequest.bRequest)\r
        {\r


@@ -45,13 +51,13 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();  \r
 \r
                        {\r
                                Endpoint_ClearSETUP();  \r
 \r

-                               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
+                               uint8_t  ReportINData[HIDInterfaceInfo->Config.ReportINBufferSize];\r

                                uint16_t ReportINSize;\r
                                uint8_t  ReportID = (USB_ControlRequest.wValue & 0xFF);\r
 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r
                                \r
                                uint16_t ReportINSize;\r
                                uint8_t  ReportID = (USB_ControlRequest.wValue & 0xFF);\r
 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r
                                \r

-                               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
+                               ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r

 \r
                                Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
                                Endpoint_ClearOUT();\r
 \r
                                Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
                                Endpoint_ClearOUT();\r


@@ -70,7 +76,7 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                                Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize);\r
                                Endpoint_ClearIN();\r
                                \r
                                Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize);\r
                                Endpoint_ClearIN();\r
                                \r

-                               CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize);\r
+                               CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize);\r

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


@@ -79,11 +85,10 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r

-                               Endpoint_Write_Byte(HIDInterfaceInfo->UsingReportProtocol);\r
+                               Endpoint_Write_Byte(HIDInterfaceInfo->State.UsingReportProtocol);\r

                                Endpoint_ClearIN();\r
 \r
                                Endpoint_ClearIN();\r
 \r

-                               while (!(Endpoint_IsOUTReceived()));\r
-                               Endpoint_ClearOUT();\r
+                               Endpoint_ClearStatusStage();\r

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


@@ -92,22 +97,24 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r

-                               HIDInterfaceInfo->UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);\r
+                               HIDInterfaceInfo->State.UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);\r

                                \r
                                \r

-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

                        }\r
                        \r
                        break;\r
                case REQ_SetIdle:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                        \r
                        break;\r
                case REQ_SetIdle:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSETUP();\r
-                               \r
-                               HIDInterfaceInfo->IdleCount = ((USB_ControlRequest.wValue >> 8) << 2);\r
-                               \r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               if ((USB_ControlRequest.wIndex         == HIDInterfaceInfo->Config.InterfaceNumber) ||\r
+                                   (USB_ControlRequest.wValue & 0xFF) == 0)\r
+                               {\r
+                                       Endpoint_ClearSETUP();\r
+                                       \r
+                                       HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);\r
+                                       \r
+                                       Endpoint_ClearStatusStage();\r
+                               }\r

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


@@ -116,23 +123,24 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r
                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r

-                               Endpoint_Write_Byte(HIDInterfaceInfo->IdleCount >> 2);\r
+                               Endpoint_Write_Byte(HIDInterfaceInfo->State.IdleCount >> 2);\r

                                Endpoint_ClearIN();\r
 \r
                                Endpoint_ClearIN();\r
 \r

-                               while (!(Endpoint_IsOUTReceived()));\r
-                               Endpoint_ClearOUT();\r
+                               Endpoint_ClearStatusStage();\r

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

-bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
 {\r

-       HIDInterfaceInfo->UsingReportProtocol = true;\r
+       memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));\r
+       HIDInterfaceInfo->State.IdleCount = 500;\r
+       HIDInterfaceInfo->State.UsingReportProtocol = true;\r

 \r
 \r

-       if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
-                                                                        ENDPOINT_DIR_IN, HIDInterfaceInfo->ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))\r
+       if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
+                                                                        ENDPOINT_DIR_IN, HIDInterfaceInfo->Config.ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))\r

        {\r
                return false;\r
        }\r
        {\r
                return false;\r
        }\r


@@ -140,26 +148,26 @@ bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)
        return true;\r
 }\r
                \r
        return true;\r
 }\r
                \r

-void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r

          return;\r
 \r
          return;\r
 \r

-       Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportINEndpointNumber);\r
+       Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);\r

        \r
        if (Endpoint_IsReadWriteAllowed() &&\r
        \r
        if (Endpoint_IsReadWriteAllowed() &&\r

-           !(HIDInterfaceInfo->IdleCount && HIDInterfaceInfo->IdleMSRemaining))\r
+           !(HIDInterfaceInfo->State.IdleCount && HIDInterfaceInfo->State.IdleMSRemaining))\r

        {\r
        {\r

-               if (HIDInterfaceInfo->IdleCount && !(HIDInterfaceInfo->IdleMSRemaining))\r
-                 HIDInterfaceInfo->IdleMSRemaining = HIDInterfaceInfo->IdleCount;\r
+               if (HIDInterfaceInfo->State.IdleCount && !(HIDInterfaceInfo->State.IdleMSRemaining))\r
+                 HIDInterfaceInfo->State.IdleMSRemaining = HIDInterfaceInfo->State.IdleCount;\r

 \r
 \r

-               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
+               uint8_t  ReportINData[HIDInterfaceInfo->Config.ReportINBufferSize];\r

                uint16_t ReportINSize;\r
                uint8_t  ReportID = 0;\r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
                uint16_t ReportINSize;\r
                uint8_t  ReportID = 0;\r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r

-               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
+               ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r

 \r
                if (ReportINSize)\r
                {\r
 \r
                if (ReportINSize)\r
                {\r


@@ -172,3 +180,5 @@ void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                Endpoint_ClearIN();\r
        }\r
 }\r
                Endpoint_ClearIN();\r
        }\r
 }\r

+\r
+#endif\r