Changeset 0773396 in mainline for uspace/app/devctl/devctl.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (7 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)
+{
+        const char *sstate;
+
+        switch (state) {
+        case DRIVER_NOT_STARTED:
+                sstate = "not started";
+                break;
+        case DRIVER_STARTING:
+                sstate = "starting";
+                break;
+        case DRIVER_RUNNING:
+                sstate = "running";
+                break;
+        default:
+                sstate = "unknown";
+        }
+
+        return sstate;
+}
 
 static int fun_subtree_print(devman_handle_t funh, int lvl)
@@ -52 +75 @@
         devman_handle_t *cfuns;
         size_t count, i;
+        unsigned int score;
         int rc;
         int j;
@@ -74 +98 @@
                 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);
         if (rc == ENOENT)
@@ -159 +197 @@
 }
 
+static int drv_list(void)
+{
+        devman_handle_t *devs;
+        devman_handle_t *drvs;
+        driver_state_t state;
+        const char *sstate;
+        size_t ndrvs;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_get_drivers(&drvs, &ndrvs);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 0; i < ndrvs; i++) {
+                devs = NULL;
+
+                rc = devman_driver_get_name(drvs[i], drv_name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_state(drvs[i], &state);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_devices(drvs[i], &devs, &ndevs);
+                if (rc != EOK)
+                        goto skip;
+
+                sstate = drv_state_str(state);
+
+                printf("%-11s %3zu %s\n", sstate, ndevs, drv_name);
+skip:
+                free(devs);
+        }
+        free(drvs);
+
+        return EOK;
+}
+
+static int drv_show(char *drvname)
+{
+        devman_handle_t *devs;
+        devman_handle_t drvh;
+        devman_handle_t funh;
+        driver_state_t state;
+        const char *sstate;
+        unsigned int score;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK)
+                return rc;
+
+        devs = NULL;
+
+        rc = devman_driver_get_name(drvh, drv_name, MAX_NAME_LENGTH);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_state(drvh, &state);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_devices(drvh, &devs, &ndevs);
+        if (rc != EOK)
+                return rc;
+
+        sstate = drv_state_str(state);
+
+        printf("Driver: %s\n", drv_name);
+        printf("State: %s\n", sstate);
+
+        printf("Attached devices:\n");
+
+        for (i = 0; i < ndevs; i++) {
+                rc = devman_dev_get_parent(devs[i], &funh);
+                if (rc != EOK)
+                        goto error;
+
+                rc = devman_fun_get_path(funh, name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        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);
+        }
+
+error:
+        free(devs);
+
+        return EOK;
+}
+
+static int drv_load(const char *drvname)
+{
+        int rc;
+        devman_handle_t drvh;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK) {
+                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        rc = devman_driver_load(drvh);
+        if (rc != EOK) {
+                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
-        printf("syntax: devctl [(online|offline) <function>]\n");
+        printf("syntax:\n");
+        printf("\tdevctl\n");
+        printf("\tdevctl online <function>]\n");
+        printf("\tdevctl offline <function>]\n");
+        printf("\tdevctl list-drv\n");
+        printf("\tdevctl show-drv <driver-name>\n");
+        printf("\tdevctl load-drv <driver-name>\n");
 }
 
@@ -168 +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)
@@ -194 +371 @@
                         return 2;
                 }
+        } else if (str_cmp(argv[1], "list-drv") == 0) {
+                rc = drv_list();
+                if (rc != EOK)
+                        return 2;
+        } else if (str_cmp(argv[1], "show-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_show(argv[2]);
+                if (rc != EOK) {
+                        return 2;
+                }
+        } else if (str_cmp(argv[1], "load-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_load(argv[2]);
+                if (rc != EOK)
+                        return 2;
         } else {
                 printf(NAME ": Invalid argument '%s'.\n", argv[1]);