Changes in uspace/drv/bus/usb/ohci/ohci.c [27ed734c:8b54fe6] in mainline

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -76 +76 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Get USB address assigned to root hub.
- *
- * @param[in] fun Root hub function.
- * @param[out] address Store the address here.
- * @return Error code.
- */
-static int rh_get_my_address(ddf_fun_t *fun, usb_address_t *address)
+/** Get address of the device identified by handle.
+ *
+ * @param[in] dev DDF instance of the device to use.
+ * @param[in] iid (Unused).
+ * @param[in] call Pointer to the call that represents interrupt.
+ */
+static int usb_iface_get_address(
+    ddf_fun_t *fun, devman_handle_t handle, usb_address_t *address)
 {
         assert(fun);
+        usb_device_manager_t *manager =
+            &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
+
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
+        if (addr < 0) {
+                return addr;
+        }
 
         if (address != NULL) {
-                *address = dev_to_ohci(fun->dev)->hc.rh.address;
+                *address = addr;
         }
 
@@ -99 +107 @@
  * @return Error code.
  */
-static int rh_get_hc_handle(
+static int usb_iface_get_hc_handle(
     ddf_fun_t *fun, devman_handle_t *handle)
 {
@@ -113 +121 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_hc_handle = rh_get_hc_handle,
-        .get_my_address = rh_get_my_address,
+        .get_hc_handle = usb_iface_get_hc_handle,
+        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/