Changeset c54b898 in mainline for uspace/lib/usbdev/src/driver.c

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.

File:

• uspace/lib/usbdev/src/driver.c (modified) (1 diff)

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;