Changeset 7aaed09 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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/drv/bus/usb/ohci/ohci.c (modified) (3 diffs)

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

@@ -76 +76 @@
 }
 /*----------------------------------------------------------------------------*/
-/** 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)
+/** 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)
 {
         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_address(manager, handle);
-        if (addr < 0) {
-                return addr;
-        }
 
         if (address != NULL) {
-                *address = addr;
+                *address = dev_to_ohci(fun->dev)->hc.rh.address;
         }
 
@@ -108 +99 @@
  * @return Error code.
  */
-static int usb_iface_get_hc_handle(
+static int rh_get_hc_handle(
     ddf_fun_t *fun, devman_handle_t *handle)
 {
@@ -122 +113 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle,
-        .get_address = usb_iface_get_address
+        .get_hc_handle = rh_get_hc_handle,
+        .get_my_address = rh_get_my_address,
 };
 /*----------------------------------------------------------------------------*/