libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[usbd] Fixed an error where change the interface did not call handler.|修正了改变接口不调用回调的问题

This commit is contained in:
guozhanxin 2019-09-19 20:58:58 +08:00
parent ae7a33c27c
commit cde81a296d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/drivers/usb/usbdevice/core/core.c
View File

@ -237,6 +237,7 @@ static rt_err_t _get_interface(struct udevice* device, ureq_t setup)
{ {
rt_uint8_t value; rt_uint8_t value;
uintf_t intf; uintf_t intf;
ufunction_t func;
/* parameter check */ /* parameter check */
RT_ASSERT(device != RT_NULL); RT_ASSERT(device != RT_NULL);
@ -251,12 +252,17 @@ static rt_err_t _get_interface(struct udevice* device, ureq_t setup)
} }
/* find the specified interface and its alternate setting */ /* find the specified interface and its alternate setting */
intf = rt_usbd_find_interface(device, setup->wIndex & 0xFF, RT_NULL); intf = rt_usbd_find_interface(device, setup->wIndex & 0xFF, &func);
value = intf->curr_setting->intf_desc->bAlternateSetting; value = intf->curr_setting->intf_desc->bAlternateSetting;
/* send the interface alternate setting to endpoint 0*/ /* send the interface alternate setting to endpoint 0*/
rt_usbd_ep0_write(device, &value, 1); rt_usbd_ep0_write(device, &value, 1);
if (intf->handler)
{
intf->handler(func, setup);
}
return RT_EOK; return RT_EOK;
} }
@ -270,6 +276,7 @@ static rt_err_t _get_interface(struct udevice* device, ureq_t setup)
*/ */
static rt_err_t _set_interface(struct udevice* device, ureq_t setup) static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
{ {
ufunction_t func;
uintf_t intf; uintf_t intf;
uep_t ep; uep_t ep;
struct rt_list_node* i; struct rt_list_node* i;
@ -288,7 +295,7 @@ static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
} }
/* find the specified interface */ /* find the specified interface */
intf = rt_usbd_find_interface(device, setup->wIndex & 0xFF, RT_NULL); intf = rt_usbd_find_interface(device, setup->wIndex & 0xFF, &func);
/* set alternate setting to the interface */ /* set alternate setting to the interface */
rt_usbd_set_altsetting(intf, setup->wValue & 0xFF); rt_usbd_set_altsetting(intf, setup->wValue & 0xFF);
@ -303,6 +310,11 @@ static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
} }
dcd_ep0_send_status(device->dcd); dcd_ep0_send_status(device->dcd);
if (intf->handler)
{
intf->handler(func, setup);
}
return RT_EOK; return RT_EOK;
} }