projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...
[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 5f8ccfb..94cbf5d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -28,14 +28,17 @@
   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_ProcessControlRequest(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
+       if (USB_ControlRequest.wIndex != HIDInterfaceInfo->Config.InterfaceNumber)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
@@ -45,14 +48,17 @@ 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
-                               uint16_t ReportINSize;\r
-\r
-                               memset(ReportINData, 0, sizeof(ReportINData));\r
+                               uint16_t ReportINSize = 0;\r
+                               uint8_t  ReportID     = (USB_ControlRequest.wValue & 0xFF);\r
+                               uint8_t  ReportType   = (USB_ControlRequest.wValue >> 8) - 1;\r
 \r
 \r
-                               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+                               memset(HIDInterfaceInfo->Config.PrevReportINBuffer, 0, HIDInterfaceInfo->Config.PrevReportINBufferSize);\r
+                               \r
+                               CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportType,\r
+                                                                   HIDInterfaceInfo->Config.PrevReportINBuffer, &ReportINSize);\r
 \r
 \r
-                               Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
+                               Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
+                               Endpoint_Write_Control_Stream_LE(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize);\r
                                Endpoint_ClearOUT();\r
                        }\r
                \r
                                Endpoint_ClearOUT();\r
                        }\r
                \r
@@ -64,11 +70,12 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                                \r
                                uint16_t ReportOUTSize = USB_ControlRequest.wLength;\r
                                uint8_t  ReportOUTData[ReportOUTSize];\r
                                \r
                                uint16_t ReportOUTSize = USB_ControlRequest.wLength;\r
                                uint8_t  ReportOUTData[ReportOUTSize];\r
+                               uint8_t  ReportID = (USB_ControlRequest.wValue & 0xFF);\r
 \r
                                Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize);\r
                                Endpoint_ClearIN();\r
                                \r
 \r
                                Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize);\r
                                Endpoint_ClearIN();\r
                                \r
-                               CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
+                               CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize);\r
                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r
@@ -77,11 +84,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
@@ -90,10 +96,9 @@ 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 & 0xFF) != 0x00);\r
                                \r
                                \r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r
                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r
@@ -101,11 +106,10 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\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
+                                       \r
+                               HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);\r
+                                       \r
+                               Endpoint_ClearStatusStage();\r
                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r
@@ -114,80 +118,78 @@ 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.UsingReportProtocol = true;\r
+       HIDInterfaceInfo->State.IdleCount = 500;\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,\r
+                                                                        HIDInterfaceInfo->Config.ReportINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
        \r
        {\r
                return false;\r
        }\r
        \r
-       if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
-       {\r
-               if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber, EP_TYPE_INTERRUPT,\r
-                                                                                ENDPOINT_DIR_OUT, HIDInterfaceInfo->ReportOUTEndpointSize, ENDPOINT_BANK_SINGLE)))\r
-               {\r
-                       return false;\r
-               }\r
-       }\r
-       \r
        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
        \r
-       if (Endpoint_IsReadWriteAllowed() &&\r
-           !(HIDInterfaceInfo->IdleCount && HIDInterfaceInfo->IdleMSRemaining))\r
+       if (Endpoint_IsReadWriteAllowed())\r
        {\r
        {\r
-               if (HIDInterfaceInfo->IdleCount && !(HIDInterfaceInfo->IdleMSRemaining))\r
-                 HIDInterfaceInfo->IdleMSRemaining = HIDInterfaceInfo->IdleCount;\r
-\r
-               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
-               uint16_t ReportINSize;\r
+               uint8_t  ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];\r
+               uint8_t  ReportID     = 0;\r
+               uint16_t ReportINSize = 0;\r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
-               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
-\r
-               if (ReportINSize)\r
-                 Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r
+               bool ForceSend         = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, REPORT_ITEM_TYPE_In,\r
+                                                                            ReportINData, &ReportINSize);\r
+               bool StatesChanged     = false;\r
+               bool IdlePeriodElapsed = (HIDInterfaceInfo->State.IdleCount && !(HIDInterfaceInfo->State.IdleMSRemaining));\r
                \r
                \r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
-       {\r
-               Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber);\r
-               \r
-               if (Endpoint_IsOUTReceived())\r
+               if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)\r
                {\r
                {\r
-                       uint16_t ReportOUTSize = Endpoint_BytesInEndpoint();\r
-                       uint8_t  ReportOUTData[ReportOUTSize];\r
-                       \r
-                       if (ReportOUTSize)\r
-                         Endpoint_Read_Stream_LE(ReportOUTData, ReportOUTSize, NO_STREAM_CALLBACK);\r
-                         \r
-                       CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
+                       StatesChanged = (memcmp(ReportINData, HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize) != 0);\r
+                       memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, ReportINSize);\r
+               }\r
+\r
+               if (ReportINSize && (ForceSend || StatesChanged || IdlePeriodElapsed))\r
+               {\r
+                       HIDInterfaceInfo->State.IdleMSRemaining = HIDInterfaceInfo->State.IdleCount;\r
+\r
+                       Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);\r
+\r
+                       if (ReportID)\r
+                         Endpoint_Write_Byte(ReportID);\r
+\r
+                       Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r
                        \r
                        \r
-                       Endpoint_ClearOUT();\r
+                       Endpoint_ClearIN();\r
                }\r
        }\r
 }\r
                }\r
        }\r
 }\r
+\r
+void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo)\r
+{\r
+       if (HIDInterfaceInfo->State.IdleMSRemaining)\r
+         HIDInterfaceInfo->State.IdleMSRemaining--;\r
+}\r
+\r
+#endif\r
USB isp AVR programmer