Changeset 132ab5d1 in mainline for uspace/app/devctl/devctl.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/app/devctl/devctl.c

@@ -324 +324 @@
         rc = devman_driver_get_handle(drvname, &drvh);
         if (rc != EOK) {
-                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -330 +330 @@
         rc = devman_driver_load(drvh);
         if (rc != EOK) {
-                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
+                printf("Failed loading driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -344 +344 @@
         rc = devman_driver_get_handle(drvname, &drvh);
         if (rc != EOK) {
-                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -350 +350 @@
         rc = devman_driver_unload(drvh);
         if (rc != EOK) {
-                printf("Failed unloading driver '%s' (%d).\n", drvname, rc);
+                printf("Failed unloading driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }