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

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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) (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. */
@@ -65 +67 @@
 {
         assert(fun);
-        return usb_hc_find(fun->handle, handle);
+        return usb_get_hc_by_handle(fun->handle, handle);
 }
 
@@ -96 +98 @@
 {
         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);
-
-        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;
+        return usb_get_address_by_handle(fun->handle, address);
 }
 
@@ -137 +117 @@
         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)