Changeset 33fee91 in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2012-08-31T07:35:27Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a3da2b2

Parents:

72cf064 (diff), 0d57c3e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -105 +105 @@
         if (dev == NULL) {
                 usb_log_error("USB device `%s' structure allocation failed.\n",
-                    gen_dev->name);
+                    ddf_dev_get_name(gen_dev));
                 return ENOMEM;
         }
@@ -114 +114 @@
         if (rc != EOK) {
                 usb_log_error("USB device `%s' init failed (%s): %s.\n",
-                    gen_dev->name, err_msg, str_error(rc));
+                    ddf_dev_get_name(gen_dev), err_msg, str_error(rc));
                 return rc;
         }
@@ -139 +139 @@
                 return ENOTSUP;
         /* Just tell the driver to stop whatever it is doing */
-        usb_device_t *usb_dev = gen_dev->driver_data;
+        usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
         const int ret = driver->ops->device_rem(usb_dev);
         if (ret != EOK)
@@ -160 +160 @@
         if (driver->ops->device_gone == NULL)
                 return ENOTSUP;
-        usb_device_t *usb_dev = gen_dev->driver_data;
+        usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
         const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
@@ -415 +415 @@
         usb_address_t address;
 
-        int rc = usb_get_info_by_handle(ddf_dev->handle,
+        int rc = usb_get_info_by_handle(ddf_dev_get_handle(ddf_dev),
             &hc_handle, &address, &usb_dev->interface_no);
         if (rc != EOK) {