Changeset d1e196f7 in mainline for uspace/app

Timestamp:

2011-08-21T12:04:27Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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

Location:

uspace/app

Files:

• devctl/Makefile (added)
• devctl/devctl.c (added)
• lsusb/main.c (modified) (2 diffs)
• mkbd/main.c (modified) (1 diff)
• tester/hw/serial/serial1.c (modified) (1 diff)

uspace/app/lsusb/main.c

@@ -81 +81 @@
                 }
                 char path[MAX_PATH_LENGTH];
-                rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+                rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
                         continue;
@@ -120 +120 @@
                 }
                 char path[MAX_PATH_LENGTH];
-                rc = devman_get_device_path(hc_handle, path, MAX_PATH_LENGTH);
+                rc = devman_fun_get_path(hc_handle, path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
                         printf(NAME ": Error resolving path of HC with SID %"

uspace/app/mkbd/main.c

@@ -240 +240 @@
         
         char path[MAX_PATH_LENGTH];
-        rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+        rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
                 return ENOMEM;

uspace/app/tester/hw/serial/serial1.c

@@ -72 +72 @@
         
         devman_handle_t handle;
-        int res = devman_device_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
+        int res = devman_fun_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
             IPC_FLAG_BLOCKING);
         if (res != EOK)