chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #95 from grissiom/vcom 

usbdevice/core: add reset function to support hotplug
This commit is contained in:
qiuyiuestc 2013-05-25 01:05:00 -07:00
parent 2e25159a83 97a507e667
commit a33e992724
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/drivers/include/drivers/usb_device.h
View File

@ -145,6 +145,7 @@ enum udev_msg_type
USB_MSG_SETUP_NOTIFY,
USB_MSG_DATA_NOTIFY,
USB_MSG_SOF,
USB_MSG_RESET,
};
typedef enum udev_msg_type udev_msg_type;

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

@ -241,7 +241,7 @@ static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
dcd_ep_stall(device->dcd, 0);
return -RT_ERROR;
}
/* find the specified interface */
intf = rt_usbd_find_interface(device, setup->index & 0xFF, RT_NULL);
@ -279,7 +279,7 @@ static rt_err_t _get_config(struct udevice* device, ureq_t setup)
RT_ASSERT(device->curr_cfg != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_get_config\n"));
if (device->state == USB_STATE_CONFIGURED)
{
/* get current configuration */
@ -319,7 +319,7 @@ static rt_err_t _set_config(struct udevice* device, ureq_t setup)
if (setup->value > device->dev_desc.bNumConfigurations)
{
dcd_ep_stall(device->dcd, 0);
dcd_ep_stall(device->dcd, 0);
return -RT_ERROR;
}
@ -384,9 +384,9 @@ static rt_err_t _set_address(struct udevice* device, ureq_t setup)
/* set address in device control driver */
dcd_set_address(device->dcd, setup->value);
device->state = USB_STATE_ADDRESS;
/* issue status stage */
dcd_send_status(device->dcd);
@ -413,7 +413,7 @@ static rt_err_t _request_interface(struct udevice* device, ureq_t setup)
RT_ASSERT(setup != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_request_interface\n"));
intf = rt_usbd_find_interface(device, setup->index & 0xFF, &cls);
if (intf != RT_NULL)
{
@ -423,7 +423,7 @@ static rt_err_t _request_interface(struct udevice* device, ureq_t setup)
{
ret = -RT_ERROR;
}
return ret;
}
@ -666,6 +666,35 @@ rt_err_t _sof_notify(udevice_t device)
return RT_EOK;
}
/**
* This function will reset all class.
*
* @param device the usb device object.
*
* @return RT_EOK.
*/
rt_err_t _reset_notify(udevice_t device)
{
struct rt_list_node *i;
uclass_t cls;
RT_ASSERT(device != RT_NULL);
/* to notity every class that sof event comes */
for (i=device->curr_cfg->cls_list.next;
i!=&device->curr_cfg->cls_list; i=i->next)
{
cls = (uclass_t)rt_list_entry(i, struct uclass, list);
if(cls->ops->stop != RT_NULL)
cls->ops->stop(device, cls);
if(cls->ops->run != RT_NULL)
cls->ops->run(device, cls);
}
return RT_EOK;
}
/**
* This function will create an usb device object.
*
@ -1382,6 +1411,10 @@ static void rt_usbd_thread_entry(void* parameter)
case USB_MSG_SETUP_NOTIFY:
_setup_request(device, (ureq_t)msg.content.setup_msg.packet);
break;
case USB_MSG_RESET:
if (device->state == USB_STATE_ADDRESS)
_reset_notify(device);
break;
default:
rt_kprintf("unknown msg type\n");
break;