Fixed MIDI Device Class driver not sending/receiving MIDI packets of the correct...

[pub/USBasp.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 dc69977..11dfb67 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -39,7 +39,7 @@
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r
                                 uint8_t* ConfigDescriptorData)\r
 {\r
-       uint8_t  FoundEndpoints = 0;\r
+       uint8_t FoundEndpoints = 0;\r
 \r
        memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));\r
 \r
@@ -60,18 +60,20 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
        } 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.InterfaceNumber      = CurrentHIDInterface->InterfaceNumber;\r
        HIDInterfaceInfo->State.SupportsBootSubClass = (CurrentHIDInterface->SubClass != 0);\r
 \r
-       while (FoundEndpoints != ((1 << HID_FOUND_DATAPIPE_IN) | (1 << HID_FOUND_DATAPIPE_OUT)))\r
+       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DComp_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)\r
+       {\r
+               return HID_ENUMERROR_NoHIDDescriptorFound;\r
+       }\r
+\r
+       HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_HID_Descriptor_t).HIDReportLength;\r
+\r
+       while (FoundEndpoints != (HID_FOUND_DATAPIPE_IN | HID_FOUND_DATAPIPE_OUT))\r
        {\r
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
-                                             DComp_HID_Host_NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                                             DComp_HID_Host_NextHIDInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
                {\r
                        if (FoundEndpoints == (1 << HID_FOUND_DATAPIPE_IN))\r
                          break;\r
@@ -85,19 +87,21 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
                                                           EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                       HIDInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
                        \r
-                       FoundEndpoints |= (1 << HID_FOUND_DATAPIPE_IN);\r
+                       FoundEndpoints |= HID_FOUND_DATAPIPE_IN;\r
                }\r
                else\r
                {\r
                        Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,\r
                                                           EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                       HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
                        \r
-                       FoundEndpoints |= (1 << HID_FOUND_DATAPIPE_OUT);                \r
+                       FoundEndpoints |= HID_FOUND_DATAPIPE_OUT;               \r
                }\r
        }\r
 \r
-       HIDInterfaceInfo->State.Active = true;\r
+       HIDInterfaceInfo->State.IsActive = true;\r
        return HID_ENUMERROR_NoError;\r
 }\r
 \r
@@ -115,7 +119,17 @@ static uint8_t DComp_HID_Host_NextHIDInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-static uint8_t DComp_HID_Host_NextInterfaceHIDDataEndpoint(void* CurrentDescriptor)\r
+static uint8_t DComp_NextHID(void* CurrentDescriptor)\r
+{\r
+       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)\r
+         return DESCRIPTOR_SEARCH_Found;\r
+       else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
+         return DESCRIPTOR_SEARCH_Fail;\r
+       else\r
+         return DESCRIPTOR_SEARCH_NotFound;      \r
+}\r
+\r
+static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* CurrentDescriptor)\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
@@ -140,11 +154,11 @@ void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)
 \r
 bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo)\r
 {\r
-       bool ReportReceived;\r
-\r
-       if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))\r
          return false;\r
 \r
+       bool ReportReceived;\r
+\r
        Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
@@ -168,6 +182,9 @@ uint8_t USB_HID_Host_SetProtocol(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, boo
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
        \r
+       if (UseReportProtocol && !(HIDInterfaceInfo->State.SupportsBootSubClass))\r
+         return MS_ERROR_UNSUPPORTED;\r
+       \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r