Changeset 4267908 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2011-10-27T10:45:08Z (13 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.

File:

• uspace/lib/usbhost/src/iface.c (modified) (3 diffs)

uspace/lib/usbhost/src/iface.c

@@ -147 +147 @@
         hcd_t *hcd = fun_to_hcd(fun);
         assert(hcd);
-        const bool found =
-            usb_device_manager_find_by_address(&hcd->dev_manager, address, handle);
-        return found ? EOK : ENOENT;
+        return usb_device_manager_get_info_by_address(
+            &hcd->dev_manager, address, handle, NULL);
 }
 /*----------------------------------------------------------------------------*/
@@ -180 +179 @@
         /* Default address is not bound or registered,
          * thus it does not provide speed info. */
-        const usb_speed_t speed = (address == 0) ? ep_speed :
-            usb_device_manager_get_speed(&hcd->dev_manager, address);
+        usb_speed_t speed = ep_speed;
+        /* NOTE The function will return EINVAL and won't
+         * touch speed variable for default address */
+        usb_device_manager_get_info_by_address(
+            &hcd->dev_manager, address, NULL, &speed);
 
         usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
@@ -192 +194 @@
         if (!ep)
                 return ENOMEM;
-        int ret = EOK;
 
         if (hcd->ep_add_hook) {
-                ret = hcd->ep_add_hook(hcd, ep);
-        }
-        if (ret != EOK) {
-                endpoint_destroy(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(&hcd->ep_manager, ep, size);
+                const int ret = hcd->ep_add_hook(hcd, ep);
+                if (ret != EOK) {
+                        endpoint_destroy(ep);
+                        return ret;
+                }
+        }
+
+        const int ret =
+            usb_endpoint_manager_register_ep(&hcd->ep_manager, ep, size);
         if (ret != EOK) {
                 endpoint_destroy(ep);