Changeset 8b36bf2 in mainline for uspace/app/devctl/devctl.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/app/devctl/devctl.c (modified) (2 diffs)

uspace/app/devctl/devctl.c

@@ -44 +44 @@
 #define MAX_NAME_LENGTH 1024
 
+char name[MAX_NAME_LENGTH];
+char drv_name[MAX_NAME_LENGTH];
+
 static int fun_subtree_print(devman_handle_t funh, int lvl)
 {
-        char name[MAX_NAME_LENGTH];
         devman_handle_t devh;
         devman_handle_t *cfuns;
@@ -57 +59 @@
 
         rc = devman_fun_get_name(funh, name, MAX_NAME_LENGTH);
-        if (rc != EOK) {
-                str_cpy(name, MAX_NAME_LENGTH, "unknown");
-                return ENOMEM;
-        }
+        if (rc != EOK)
+                return ELIMIT;
 
         if (name[0] == '\0')
                 str_cpy(name, MAX_NAME_LENGTH, "/");
 
-        printf("%s (%" PRIun ")\n", name, funh);
+        rc = devman_fun_get_driver_name(funh, drv_name, MAX_NAME_LENGTH);
+        if (rc != EOK && rc != EINVAL)
+                return ELIMIT;
+
+        if (rc == EINVAL)
+                printf("%s\n", name);
+        else
+                printf("%s : %s\n", name, drv_name);
 
         rc = devman_fun_get_child(funh, &devh);