Fixed broken HIDReportParser.c.

[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..54bef47 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -28,9 +28,12 @@
   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_t* HIDInterfaceInfo)\r

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


@@ -47,10 +50,11 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
 \r
                                uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
                                uint16_t ReportINSize;\r
 \r
                                uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
                                uint16_t ReportINSize;\r

+                               uint8_t  ReportID = (USB_ControlRequest.wValue & 0xFF);\r

 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r

-\r
-                               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+                               \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


@@ -64,11 +68,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


@@ -125,7 +130,7 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

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

 {\r
        HIDInterfaceInfo->UsingReportProtocol = true;\r
 \r
 {\r
        HIDInterfaceInfo->UsingReportProtocol = true;\r
 \r


@@ -135,19 +140,10 @@ bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                return false;\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_t* HIDInterfaceInfo)\r

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


@@ -162,32 +158,22 @@ void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)
 \r
                uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
                uint16_t ReportINSize;\r
 \r
                uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
                uint16_t ReportINSize;\r

+               uint8_t  ReportID = 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
+               ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r

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

-                 Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r
-               \r
-               Endpoint_ClearIN();\r
-       }\r
-       \r
-       if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
-       {\r
-               Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber);\r
-               \r
-               if (Endpoint_IsOUTReceived())\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
-                       \r
-                       Endpoint_ClearOUT();\r
+                       if (ReportID)\r
+                         Endpoint_Write_Stream_LE(&ReportID, sizeof(ReportID), NO_STREAM_CALLBACK);\r
+\r
+                       Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r

                }\r
                }\r

+               \r
+               Endpoint_ClearIN();\r

        }\r
 }\r
        }\r
 }\r

+\r
+#endif\r