Changes in uspace/lib/usb/src/ddfiface.c [e882e3a:27ed734c] in mainline

File:

• uspace/lib/usb/src/ddfiface.c (modified) (5 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -33 +33 @@
  * Implementations of DDF interfaces functions (actual implementation).
  */
+#include <ipc/devman.h>
 #include <devman.h>
 #include <async.h>
-#include <usb_iface.h>
 #include <usb/ddfiface.h>
 #include <usb/hc.h>
@@ -42 +42 @@
 #include <errno.h>
 #include <assert.h>
-
-#include <usb/dev.h>
 
 /** DDF interface for USB device, implementation for typical hub. */
@@ -67 +65 @@
 {
         assert(fun);
-        return usb_get_hc_by_handle(fun->handle, handle);
+        return usb_hc_find(fun->handle, handle);
 }
 
@@ -98 +96 @@
 {
         assert(fun);
-        return usb_get_address_by_handle(fun->handle, address);
+
+        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);
+
+        sysarg_t addr;
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_MY_ADDRESS, &addr);
+
+        async_exchange_end(exch);
+        async_hangup(parent_sess);
+
+        if (rc != EOK)
+                return rc;
+
+        if (address != NULL)
+                *address = (usb_address_t) addr;
+
+        return EOK;
 }
 
@@ -117 +137 @@
         assert(fun);
         assert(fun->driver_data);
-        const usb_hub_attached_device_t *device = fun->driver_data;
+        usb_hub_attached_device_t *device = fun->driver_data;
         assert(device->fun == fun);
         if (address)