Changeset 107f2e0 in mainline for uspace/lib/usb/src/resolve.c

Timestamp:

2011-08-19T16:56:41Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f00af83

Parents:

cf22ada (diff), 45059d6b (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) (3 diffs)

uspace/lib/usb/src/resolve.c

@@ -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);