Merge pull request #3484 from qz721/master

BernardXiong · web-flow · commit 0f57faa591b4 · 2020-03-30T21:20:02.000+08:00
修复USB不能正常识别composite设备的bug
diff --git a/components/drivers/usb/usbdevice/class/hid.c b/components/drivers/usb/usbdevice/class/hid.c
@@ -458,9 +458,6 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
 
     struct hid_s *data = (struct hid_s *) func->user_data;
 
-    if(setup->wIndex != 0)
-        return -RT_EIO;
-
     switch (setup->bRequest)
     {
     case USB_REQ_GET_DESCRIPTOR:

Original file line number	Diff line number	Diff line change
`@@ -458,9 +458,6 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)`
`458`	`458`
`459`	`459`	`struct hid_s data = (struct hid_s ) func->user_data;`
`460`	`460`
`461`		`- if(setup->wIndex != 0)`
`462`		`- return -RT_EIO;`
`463`		`-`
`464`	`461`	`switch (setup->bRequest)`
`465`	`462`	`{`
`466`	`463`	`case USB_REQ_GET_DESCRIPTOR:`