Changeset 925a21e in mainline for uspace/lib/usb/src/resolve.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/resolve.c (modified) (5 diffs)

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;
@@ -152 +152 @@
                 if (str_length(func_start) > 0) {
                         char tmp_path[MAX_DEVICE_PATH ];
-                        rc = devman_get_device_path(dev_handle,
+                        rc = devman_fun_get_path(dev_handle,
                             tmp_path, MAX_DEVICE_PATH);
                         if (rc != EOK) {
@@ -173 +173 @@
 
         /* First try to get the device handle. */
-        rc = devman_device_get_handle(path, &dev_handle, 0);
+        rc = devman_fun_get_handle(path, &dev_handle, 0);
         if (rc != EOK) {
                 free(path);
@@ -184 +184 @@
                 /* Get device handle first. */
                 devman_handle_t tmp_handle;
-                rc = devman_device_get_handle(path, &tmp_handle, 0);
+                rc = devman_fun_get_handle(path, &tmp_handle, 0);
                 if (rc != EOK) {
                         free(path);