Add new functions to the HID host class driver, refine HID interface protocol matching.

[pub/lufa.git] / LUFA / Drivers / USB / Class / Host / HID.c

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index a42f8af..dc69977 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -46,6 +46,8 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
          return HID_ENUMERROR_InvalidConfigDescriptor;\r
        \r
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
          return HID_ENUMERROR_InvalidConfigDescriptor;\r
        \r

+       USB_Descriptor_Interface_t* CurrentHIDInterface;\r
+       \r

        do\r
        {\r
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
        do\r
        {\r
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r


@@ -53,9 +55,18 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
                {\r
                        return HID_ENUMERROR_NoHIDInterfaceFound;\r
                }\r
                {\r
                        return HID_ENUMERROR_NoHIDInterfaceFound;\r
                }\r

-       } while (HIDInterfaceInfo->Config.MatchInterfaceProtocol &&\r
-                DESCRIPTOR_PCAST(ConfigDescriptorData,\r
-                                 USB_Descriptor_Interface_t)->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol);\r
+               \r
+               CurrentHIDInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);\r
+       } while (HIDInterfaceInfo->Config.HIDInterfaceProtocol &&\r
+                (CurrentHIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));\r
+\r
+       HIDInterfaceInfo->State.InterfaceNumber      =\r
+       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
+                            CurrentHIDInterface->InterfaceNumber;\r
+       #else\r
+                            CurrentHIDInterface->bInterfaceNumber;\r
+       #endif\r
+       HIDInterfaceInfo->State.SupportsBootSubClass = (CurrentHIDInterface->SubClass != 0);\r

 \r
        while (FoundEndpoints != ((1 << HID_FOUND_DATAPIPE_IN) | (1 << HID_FOUND_DATAPIPE_OUT)))\r
        {\r
 \r
        while (FoundEndpoints != ((1 << HID_FOUND_DATAPIPE_IN) | (1 << HID_FOUND_DATAPIPE_OUT)))\r
        {\r


@@ -144,4 +155,20 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)
        return ReportReceived;\r
 }\r
 \r
        return ReportReceived;\r
 }\r
 \r

+uint8_t USB_HID_Host_SetProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, bool UseReportProtocol)\r
+{\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                       .bRequest      = REQ_SetProtocol,\r
+                       .wValue        = UseReportProtocol,\r
+                       .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,\r
+                       .wLength       = 0,\r
+               };\r
+\r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       \r
+       return USB_Host_SendControlRequest(NULL);\r
+}\r
+\r

 #endif\r
 #endif\r