Changeset f55b12b in mainline for uspace/lib/usb/src/hc.c

Timestamp:

2011-08-18T18:41:03Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0cc32f2, a92cf94f, cf22ada

Parents:

3190e88 (diff), 763e0cd (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/lib/usb/src/hc.c (modified) (1 diff)

uspace/lib/usb/src/hc.c

@@ -201 +201 @@
 /** Get host controller handle by its class index.
  *
- * @param class_index Class index for the host controller.
+ * @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_class(size_t class_index,
-    devman_handle_t *hc_handle)
-{
-        char *class_index_str;
-        devman_handle_t hc_handle_tmp;
+int usb_ddf_get_hc_handle_by_sid(service_id_t sid, devman_handle_t *hc_handle)
+{
+        devman_handle_t handle;
         int rc;
-
-        rc = asprintf(&class_index_str, "%zu", class_index);
-        if (rc < 0) {
-                return ENOMEM;
-        }
-        rc = devman_device_get_handle_by_class("usbhc", class_index_str,
-            &hc_handle_tmp, 0);
-        free(class_index_str);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (hc_handle != NULL) {
-                *hc_handle = hc_handle_tmp;
-        }
-
-        return EOK;
+        
+        rc = devman_fun_sid_to_handle(sid, &handle);
+        if (hc_handle != NULL)
+                *hc_handle = handle;
+        
+        return rc;
 }