Changeset b7068da in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/usb/src/ddfiface.c (modified) (4 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -44 +44 @@
 #include <assert.h>
 
+#include <usb/dev.h>
+
 /** DDF interface for USB device, implementation for typical hub. */
 usb_iface_t usb_iface_hub_impl = {
@@ -66 +68 @@
 {
         assert(fun);
-        return usb_hc_find(fun->handle, handle);
+        return usb_get_hc_by_handle(fun->handle, handle);
 }
 
@@ -97 +99 @@
 {
         assert(fun);
-
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        if (!exch) {
-                async_hangup(parent_sess);
-                return ENOMEM;
-        }
-
-        const int ret = usb_get_my_address(exch, address);
-
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-
-        return ret;
+        return usb_get_address_by_handle(fun->handle, address);
 }
 
@@ -134 +118 @@
         assert(fun);
         assert(fun->driver_data);
-        usb_hub_attached_device_t *device = fun->driver_data;
+        const usb_hub_attached_device_t *device = fun->driver_data;
         assert(device->fun == fun);
         if (address)