Changeset 4c9b28a in mainline for uspace/app/devctl/devctl.c

Timestamp:

2013-09-11T17:32:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5759975a

Parents:

1db5669

Message:

Printing match IDs of drivers and functions.

File:

• uspace/app/devctl/devctl.c (modified) (8 diffs)

uspace/app/devctl/devctl.c

@@ -35 +35 @@
 #include <devman.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +45 @@
 #define MAX_NAME_LENGTH 1024
 
-char name[MAX_NAME_LENGTH];
-char drv_name[MAX_NAME_LENGTH];
+static char name[MAX_NAME_LENGTH];
+static char drv_name[MAX_NAME_LENGTH];
+static bool verbose = false;
 
 static const char *drv_state_str(driver_state_t state)
@@ -73 +75 @@
         devman_handle_t *cfuns;
         size_t count, i;
+        unsigned int score;
         int rc;
         int j;
@@ -94 +97 @@
         else
                 printf("%s : %s\n", name, drv_name);
+
+        if (verbose) {
+                for (i = 0; true; i++) {
+                        rc = devman_fun_get_match_id(funh, i, name, MAX_NAME_LENGTH,
+                            &score);
+                        if (rc != EOK)
+                                break;
+
+                        for (j = 0; j < lvl; j++)
+                                printf("    ");
+
+                        printf("    %u %s\n", score, name);
+                }
+        }
 
         rc = devman_fun_get_child(funh, &devh);
@@ -226 +243 @@
         driver_state_t state;
         const char *sstate;
+        unsigned int score;
         size_t ndevs;
         size_t i;
@@ -252 +270 @@
         printf("Driver: %s\n", drv_name);
         printf("State: %s\n", sstate);
+
         printf("Attached devices:\n");
 
@@ -263 +282 @@
                         goto error;
                 printf("\t%s\n", name);
+        }
+
+        printf("Match IDs:\n");
+
+        for (i = 0; true; i++) {
+                rc = devman_driver_get_match_id(drvh, i, name, MAX_NAME_LENGTH,
+                    &score);
+                if (rc != EOK)
+                        break;
+
+                printf("\t%u %s\n", score, name);
         }
 
@@ -306 +336 @@
         int rc;
 
-        if (argc == 1) {
+        if (argc == 1 || argv[1][0] == '-') {
+                if (argc > 1) {
+                        if (str_cmp(argv[1], "-v") == 0) {
+                                verbose = true;
+                        } else {
+                                printf(NAME ": Invalid argument '%s'\n", argv[1]);
+                                print_syntax();
+                                return 1;
+                        }
+                }
                 rc = fun_tree_print();
                 if (rc != EOK)