Changeset 132ab5d1 in mainline for uspace/srv/bd/sata_bd/sata_bd.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/srv/bd/sata_bd/sata_bd.c (modified) (6 diffs)

uspace/srv/bd/sata_bd/sata_bd.c

@@ -41 +41 @@
 #include <devman.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdio.h>
 #include <str.h>
@@ -250 +251 @@
         async_set_fallback_port_handler(sata_bd_connection, NULL);
         rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+        if (rc != EOK) {
+                printf(NAME ": Unable to register driver: %s.\n", str_error(rc));
                 return rc;
         }
@@ -257 +258 @@
         rc = get_sata_disks();
         if (rc != EOK) {
+                // TODO: log the error
                 return rc;
         }
@@ -262 +264 @@
         rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                printf("%s: Failed resolving category 'disk'.\n", NAME);
+                printf("%s: Failed resolving category 'disk': %s.\n", NAME, str_error(rc));
                 return rc;
         }
@@ -271 +273 @@
                 rc = loc_service_register(name, &disk[i].service_id);
                 if (rc != EOK) {
-                        printf(NAME ": Unable to register device %s.\n", name);
+                        printf(NAME ": Unable to register device %s: %s\n", name, str_error(rc));
                         return rc;
                 }
@@ -277 +279 @@
                 rc = loc_service_add_to_cat(disk[i].service_id, disk_cat);
                 if (rc != EOK) {
-                        printf("%s: Failed adding %s to category.",
-                            NAME, disk[i].dev_name);
+                        printf("%s: Failed adding %s to category: %s.",
+                            NAME, disk[i].dev_name, str_error(rc));
                         return rc;
                 }