diff options
| author | Amir Hammad <amir.hammad@hotmail.com> | 2016-09-06 08:40:32 +0200 |
|---|---|---|
| committer | Amir Hammad <amir.hammad@hotmail.com> | 2016-09-11 13:31:47 +0200 |
| commit | b895498df9be02eba1c285c5cdc58eb088bb86fc (patch) | |
| tree | 724d99c61b5a0d2cf83dc69025bc7f432869a25c | |
| parent | c9869466ddfab7e7f6258397d1b8863c27e37149 (diff) | |
| download | secure-hid-b895498df9be02eba1c285c5cdc58eb088bb86fc.tar.gz secure-hid-b895498df9be02eba1c285c5cdc58eb088bb86fc.tar.bz2 secure-hid-b895498df9be02eba1c285c5cdc58eb088bb86fc.zip | |
hub: use common code to remove device
Signed-off-by: Amir Hammad <amir.hammad@hotmail.com>
| -rw-r--r-- | include/driver/usbh_device_driver.h | 1 | ||||
| -rw-r--r-- | src/usbh_core.c | 2 | ||||
| -rw-r--r-- | src/usbh_driver_hub.c | 7 |
3 files changed, 3 insertions, 7 deletions
diff --git a/include/driver/usbh_device_driver.h b/include/driver/usbh_device_driver.h index 7e013a0..03bbd3a 100644 --- a/include/driver/usbh_device_driver.h +++ b/include/driver/usbh_device_driver.h @@ -259,6 +259,7 @@ void usbh_write(usbh_device_t *dev, const usbh_packet_t *packet); /* Helper functions used by device drivers */ void device_control(usbh_device_t *dev, usbh_packet_callback_t callback, const struct usb_setup_data *setup_data, void *data); +void device_remove(usbh_device_t *dev); END_DECLS diff --git a/src/usbh_core.c b/src/usbh_core.c index e673a59..fd1dca5 100644 --- a/src/usbh_core.c +++ b/src/usbh_core.c @@ -52,7 +52,7 @@ static bool enumeration(void) return usbh_data.enumeration_run; } -static void device_remove(usbh_device_t *dev) +void device_remove(usbh_device_t *dev) { if (dev->drv && dev->drvdata) { dev->drv->remove(dev->drvdata); diff --git a/src/usbh_driver_hub.c b/src/usbh_driver_hub.c index 87f8578..7dc99ea 100644 --- a/src/usbh_driver_hub.c +++ b/src/usbh_driver_hub.c @@ -449,13 +449,8 @@ static void event(usbh_device_t *dev, usbh_packet_callback_data_t cb_data) }
} else {
LOG_PRINTF("\t\t\t\tDISCONNECT EVENT\n");
- if (hub->device[port]->drv && hub->device[port]->drvdata) {
- hub->device[port]->drv->remove(hub->device[port]->drvdata);
- }
- hub->device[port]->address = -1;
+ device_remove(hub->device[port]);
- hub->device[port]->drv = 0;
- hub->device[port]->drvdata = 0;
hub->device[port] = 0;
hub->current_port = CURRENT_PORT_NONE;
hub->state = EVENT_STATE_POLL_REQ;
|