Changeset 54cbda2 in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2011-12-14T22:26:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4291215

Parents:

8e3742f9

Message:

libusbdev: Add support for dev_remove.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (4 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -102 +102 @@
         assert(driver->ops->device_add);
 
+        /* Get place for driver data. */
         usb_device_t *dev = ddf_dev_data_alloc(gen_dev, sizeof(usb_device_t));
         if (dev == NULL) {
@@ -108 +109 @@
                 return ENOMEM;
         }
+
+        /* Initialize generic USB driver data. */
         const char *err_msg = NULL;
         int rc = usb_device_init(dev, gen_dev, driver->endpoints, &err_msg);
@@ -116 +119 @@
         }
 
+        /* Start USB driver specific initialization. */
         rc = driver->ops->device_add(dev);
         if (rc != EOK)
@@ -135 +139 @@
         if (driver->ops->device_rem == NULL)
                 return ENOTSUP;
-        /* Just tell the driver to stop whatever it is doing, keep structures */
-        const int ret = driver->ops->device_rem(gen_dev->driver_data);
+        /* Just tell the driver to stop whatever it is doing */
+        usb_device_t *usb_dev = gen_dev->driver_data;
+        const int ret = driver->ops->device_rem(usb_dev);
         if (ret != EOK)
                 return ret;
-        return ENOTSUP;
+        usb_device_deinit(usb_dev);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/