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

Timestamp:

2013-01-27T00:44:23Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

71384bd3

Parents:

8b68bdf

Message:

libusbdev: Make usb_device_t opaque.

File:

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

uspace/lib/usbdev/src/driver.c

@@ -54 +54 @@
         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) {
-                usb_log_error("USB device `%s' structure allocation failed.\n",
-                    ddf_dev_get_name(gen_dev));
-                return ENOMEM;
-        }
-
         /* Initialize generic USB driver data. */
         const char *err_msg = NULL;
-        int rc = usb_device_init(dev, gen_dev, driver->endpoints, &err_msg);
+        int rc = usb_device_create_ddf(gen_dev, driver->endpoints, &err_msg);
         if (rc != EOK) {
                 usb_log_error("USB device `%s' init failed (%s): %s.\n",
@@ -72 +64 @@
 
         /* Start USB driver specific initialization. */
-        rc = driver->ops->device_add(dev);
+        rc = driver->ops->device_add(ddf_dev_data_get(gen_dev));
         if (rc != EOK)
-                usb_device_deinit(dev);
+                usb_device_destroy_ddf(gen_dev);
         return rc;
 }
@@ -96 +88 @@
         if (ret != EOK)
                 return ret;
-        usb_device_deinit(usb_dev);
+        usb_device_destroy_ddf(gen_dev);
         return EOK;
 }
@@ -116 +108 @@
         const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_deinit(usb_dev);
+                usb_device_destroy_ddf(gen_dev);
 
         return ret;