Changeset 7aaed09 in mainline for uspace/drv/bus/usb/uhci/uhci.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/uhci/uhci.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -89 +89 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Get address of the device identified by handle.
- *
- * @param[in] fun DDF instance of the function to use.
- * @param[in] handle DDF handle of the driver seeking its USB address.
- * @param[out] address Found address.
- */
-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_uhci(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;
-        }
-
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
 /** Gets handle of the respective hc.
  *
@@ -135 +109 @@
 static usb_iface_t usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle,
-        .get_address = usb_iface_get_address
 };
 /*----------------------------------------------------------------------------*/