Changeset 4267908 in mainline for uspace/drv/bus

Timestamp:

2011-10-27T10:45:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

83c3123

Parents:

069b80d

Message:

libusbhost: Merge find_by_address and get_speed.

These functions were almost identical.
Clear handle on address release.

Location:

uspace/drv/bus/usb

Files:

• ohci/ohci.c (modified) (1 diff)
• uhci/uhci.c (modified) (1 diff)
• vhc/connhost.c (modified) (2 diffs)

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

@@ -89 +89 @@
             &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
 
-        const usb_address_t addr = usb_device_manager_find(manager, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(manager, handle);
         if (addr < 0) {
                 return addr;

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

@@ -101 +101 @@
         usb_device_manager_t *manager =
             &dev_to_uhci(fun->dev)->hc.generic.dev_manager;
-        const usb_address_t addr = usb_device_manager_find(manager, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(manager, handle);
 
         if (addr < 0) {

uspace/drv/bus/usb/vhc/connhost.c

@@ -104 +104 @@
 {
         VHC_DATA(vhc, fun);
-        bool found =
-            usb_device_manager_find_by_address(&vhc->dev_manager, address, handle);
-        return found ? EOK : ENOENT;
+        return usb_device_manager_get_info_by_address(
+            &vhc->dev_manager, address, handle, NULL);
 }
 
@@ -518 +517 @@
 
         usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-        usb_address_t addr = usb_device_manager_find(&vhc->dev_manager, handle);
+        const usb_address_t addr =
+            usb_device_manager_find_address(&vhc->dev_manager, handle);
         if (addr < 0) {
                 return addr;