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

Timestamp:

2017-10-23T18:51:34Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (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 (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

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

uspace/app/devctl/devctl.c

@@ -337 +337 @@
 }
 
+static int drv_unload(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_unload(drvh);
+        if (rc != EOK) {
+                printf("Failed unloading driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
@@ -346 +366 @@
         printf("\tdevctl show-drv <driver-name>\n");
         printf("\tdevctl load-drv <driver-name>\n");
+        printf("\tdevctl unload-drv <driver-name>\n");
 }
 
@@ -412 +433 @@
                 if (rc != EOK)
                         return 2;
+        } else if (str_cmp(argv[1], "unload-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_unload(argv[2]);
+                if (rc != EOK)
+                        return 2;
         } else {
                 printf(NAME ": Invalid argument '%s'.\n", argv[1]);