Changeset 35bc430 in mainline

Timestamp:

2013-01-27T00:42:14Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8b68bdf

Parents:

bb70637

Message:

libusbdev: Use internal bus_session to get device info.

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -313 +313 @@
 }
 
+static int usb_dev_get_info(usb_device_t *usb_dev, devman_handle_t *handle,
+    usb_address_t *address, int *iface_no)
+{
+        assert(usb_dev);
+
+        int ret = EOK;
+        async_exch_t *exch = async_exchange_begin(usb_dev->bus_session);
+        if (!exch)
+                ret = ENOMEM;
+
+        if (ret == EOK && address)
+                ret = usb_get_my_address(exch, address);
+
+        if (ret == EOK && handle)
+                ret = usb_get_hc_handle(exch, handle);
+
+        if (ret == EOK && iface_no) {
+                ret = usb_get_my_interface(exch, iface_no);
+                if (ret == ENOTSUP) {
+                        ret = EOK;
+                        *iface_no = -1;
+                }
+        }
+
+        async_exchange_end(exch);
+        return ret;
+}
+
 /** Initialize new instance of USB device.
  *
@@ -346 +374 @@
         usb_address_t address;
 
-        int rc = usb_get_info_by_handle(ddf_dev_get_handle(ddf_dev),
+        int rc = usb_dev_get_info(usb_dev,
             &hc_handle, &address, &usb_dev->interface_no);
         if (rc != EOK) {
@@ -436 +464 @@
 {
         assert(usb_dev);
-        assert(usb_dev->ddf_dev);
-        //TODO Handle case without ddf_dev
-        return ddf_dev_get_name(usb_dev->ddf_dev);
+        if (usb_dev->ddf_dev)
+                return ddf_dev_get_name(usb_dev->ddf_dev);
+        return NULL;
 }