Changeset a56a13c in mainline

Timestamp:

2011-12-12T12:35:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d02834c

Parents:

dbb7e3b

Message:

libusb: Make devman function wrapper inline.

Location:

uspace/lib/usb

Files:

• include/usb/hc.h (modified) (1 diff)
• src/hc.c (modified) (1 diff)

uspace/lib/usb/include/usb/hc.h

@@ -109 +109 @@
 }
 
-int usb_ddf_get_hc_handle_by_sid(service_id_t, devman_handle_t *);
+/** Get host controller handle by its class index.
+ *
+ * @param sid Service ID of the HC function.
+ * @param hc_handle Where to store the HC handle
+ *      (can be NULL for existence test only).
+ * @return Error code.
+ */
+static inline int usb_ddf_get_hc_handle_by_sid(
+    service_id_t sid, devman_handle_t *handle)
+{
+        devman_handle_t h;
+        return devman_fun_sid_to_handle(sid, handle ? handle : &h);
+}
 
 #endif

uspace/lib/usb/src/hc.c

@@ -257 +257 @@
         return ret;
 }
-/*----------------------------------------------------------------------------*/
-/** Get host controller handle by its class index.
- *
- * @param sid Service ID of the HC function.
- * @param hc_handle Where to store the HC handle
- *      (can be NULL for existence test only).
- * @return Error code.
- */
-int usb_ddf_get_hc_handle_by_sid(service_id_t sid, devman_handle_t *hc_handle)
-{
-        devman_handle_t handle;
-
-        const int ret = devman_fun_sid_to_handle(sid, &handle);
-        if (ret == EOK && hc_handle != NULL)
-                *hc_handle = handle;
-
-        return ret;
-}
 
 /**