Changeset e280857 in mainline for uspace/lib/usb/src

Timestamp:

2011-08-18T12:35:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99ac5cf

Parents:

12f9f0d0

Message:

Remove class infrastructure from devman.

Location:

uspace/lib/usb/src

Files:

• hc.c (modified) (1 diff)
• resolve.c (modified) (2 diffs)

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;
 }
 

uspace/lib/usb/src/resolve.c

@@ -46 +46 @@
     devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
 {
-        size_t class_index;
+        uint64_t sid;
         size_t address;
         int rc;
         char *ptr;
 
-        rc = str_size_t(path, &ptr, 10, false, &class_index);
+        rc = str_uint64(path, &ptr, 10, false, &sid);
         if (rc != EOK) {
                 return false;
@@ -64 +64 @@
                 return false;
         }
-        rc = usb_ddf_get_hc_handle_by_class(class_index, out_hc_handle);
+        rc = usb_ddf_get_hc_handle_by_sid(sid, out_hc_handle);
         if (rc != EOK) {
                 return false;