Changeset c54b898 in mainline

Timestamp:

2018-01-05T16:30:46Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b60944b

Parents:

11d4c747

git-author:

Petr Manek <petr.manek@…> (2018-01-05 16:21:03)

git-committer:

Petr Manek <petr.manek@…> (2018-01-05 16:30:46)

Message:

usbdev: refactoring

The device_rem driver callback was renamed to device_remove. Also,
a new device_removed callback was introduced. This callback will fire
after all device pipes (endpoints, internally) are unregistered from
the HC device after a call to device_remove. It is semantically
a better opportunity for the USB device driver to free resources and
join all fibrils, since endpoint unregistration will force abort all
active transfers, waking up their issuers.

Location:

uspace

Files:

• drv/block/usbmast/main.c (modified) (1 diff)
• drv/bus/usb/usbdiag/main.c (modified) (1 diff)
• drv/bus/usb/usbflbk/main.c (modified) (1 diff)
• drv/bus/usb/usbhub/main.c (modified) (1 diff)
• drv/bus/usb/usbmid/main.c (modified) (1 diff)
• drv/hid/usbhid/main.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)
• lib/usbdev/src/driver.c (modified) (1 diff)

uspace/drv/block/usbmast/main.c

@@ -390 +390 @@
 static const usb_driver_ops_t usbmast_driver_ops = {
         .device_add = usbmast_device_add,
-        .device_rem = usbmast_device_remove,
+        .device_remove = usbmast_device_remove,
         .device_gone = usbmast_device_gone,
 };

uspace/drv/bus/usb/usbdiag/main.c

@@ -186 +186 @@
 static const usb_driver_ops_t diag_driver_ops = {
         .device_add = device_add,
-        .device_rem = device_remove,
+        .device_remove = device_remove,
         .device_gone = device_gone,
         .function_online = function_online,

uspace/drv/bus/usb/usbflbk/main.c

@@ -68 +68 @@
 static const usb_driver_ops_t usbfallback_driver_ops = {
         .device_add = usbfallback_device_add,
-        .device_rem = usbfallback_device_gone,
+        .device_remove = usbfallback_device_gone,
         .device_gone = usbfallback_device_gone,
 };

uspace/drv/bus/usb/usbhub/main.c

@@ -48 +48 @@
 static const usb_driver_ops_t usb_hub_driver_ops = {
         .device_add = usb_hub_device_add,
-//      .device_rem = usb_hub_device_remove,
+//      .device_remove = usb_hub_device_remove,
         .device_gone = usb_hub_device_gone,
 };

uspace/drv/bus/usb/usbmid/main.c

@@ -162 +162 @@
 static const usb_driver_ops_t mid_driver_ops = {
         .device_add = usbmid_device_add,
-        .device_rem = usbmid_device_remove,
+        .device_remove = usbmid_device_remove,
         .device_gone = usbmid_device_gone,
         .function_online = usbmid_function_online,

uspace/drv/hid/usbhid/main.c

@@ -122 +122 @@
  * @return Error code.
  */
-static int usb_hid_device_rem(usb_device_t *dev)
+static int usb_hid_device_remove(usb_device_t *dev)
 {
         assert(dev);
@@ -164 +164 @@
 static const usb_driver_ops_t usb_hid_driver_ops = {
         .device_add = usb_hid_device_add,
-        .device_rem = usb_hid_device_rem,
+        .device_remove = usb_hid_device_remove,
         .device_gone = usb_hid_device_gone,
 };

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -45 +45 @@
         int (*device_add)(usb_device_t *);
         /** Callback when a device is about to be removed from the system. */
-        int (*device_rem)(usb_device_t *);
+        int (*device_remove)(usb_device_t *);
+        /** Callback when a device has just been removed from the system (optional). */
+        int (*device_removed)(usb_device_t *);
         /** Callback when a device was removed from the system. */
         int (*device_gone)(usb_device_t *);

uspace/lib/usbdev/src/driver.c

@@ -85 +85 @@
         assert(driver);
         assert(driver->ops);
-        if (driver->ops->device_rem == NULL)
+        if (driver->ops->device_remove == NULL)
                 return ENOTSUP;
+
         /* Just tell the driver to stop whatever it is doing */
         usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
-        const int ret = driver->ops->device_rem(usb_dev);
+        int ret = driver->ops->device_remove(usb_dev);
         if (ret != EOK)
                 return ret;
+
+        /* Notify the driver after endpoints were unregistered. */
+        usb_device_destroy_pipes(usb_dev);
+        if (driver->ops->device_removed != NULL) {
+                ret = driver->ops->device_removed(usb_dev);
+                if (ret != EOK)
+                        return ret;
+        }
+
         usb_device_destroy_ddf(gen_dev);
         return EOK;