Add master device Host demo makefile.

[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 fbc5e3a..0699218 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -45,12 +45,13 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();  \r
 \r
-                               uint8_t  ReportINData[HIDInterfaceInfo->ReportBufferSize];\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
-                               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+                               \r
+                               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
 \r
                                Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
                                Endpoint_ClearOUT();\r
@@ -64,11 +65,12 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                                \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
-                               CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
+                               CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize);\r
                        }\r
                        \r
                        break;\r
@@ -135,23 +137,8 @@ bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                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
-void USB_HID_RegisterStartOfFrame(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
-{\r
-       if (HIDInterfaceInfo->IdleMSRemaining)\r
-         HIDInterfaceInfo->IdleMSRemaining--;\r
-}\r
                \r
 void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
 {\r
@@ -166,46 +153,22 @@ void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                if (HIDInterfaceInfo->IdleCount && !(HIDInterfaceInfo->IdleMSRemaining))\r
                  HIDInterfaceInfo->IdleMSRemaining = HIDInterfaceInfo->IdleCount;\r
 \r
-               uint8_t  ReportINData[HIDInterfaceInfo->ReportBufferSize];\r
+               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
                uint16_t ReportINSize;\r
+               uint8_t  ReportID = 0;\r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
-               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, ReportINData);\r
+               ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
 \r
                if (ReportINSize)\r
                {\r
-                       Endpoint_Write_Stream_LE(ReportINData, ReportINSize\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                                                , NO_STREAM_CALLBACK\r
-                       #endif\r
-                                                );\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
                Endpoint_ClearIN();\r
        }\r
-       \r
-       if (HIDInterfaceInfo->ReportOUTEndpointNumber)\r
-       {\r
-               Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportOUTEndpointNumber);\r
-               \r
-               if (Endpoint_IsOUTReceived())\r
-               {\r
-                       uint16_t ReportOUTSize = Endpoint_BytesInEndpoint();\r
-                       uint8_t  ReportOUTData[ReportOUTSize];\r
-                       \r
-                       if (ReportOUTSize)\r
-                       {\r
-                               Endpoint_Read_Stream_LE(ReportOUTData, ReportOUTSize\r
-                               #if !defined(NO_STREAM_CALLBACKS)\r
-                                                   , NO_STREAM_CALLBACK\r
-                               #endif\r
-                                                   );\r
-                       }\r
-                         \r
-                       CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportOUTData, ReportOUTSize);\r
-                       \r
-                       Endpoint_ClearOUT();\r
-               }\r
-       }\r
 }\r