Changeset 132ab5d1 in mainline for uspace/srv/devman/main.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/devman/main.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdbool.h>
 #include <fibril_synch.h>
@@ -318 +319 @@
         int rc = log_init(NAME);
         if (rc != EOK) {
-                printf("%s: Error initializing logging subsystem.\n", NAME);
+                printf("%s: Error initializing logging subsystem: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -329 +330 @@
         rc = async_create_port(INTERFACE_DDF_DRIVER,
             devman_connection_driver, NULL, &port);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Error creating DDF driver port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
         
         rc = async_create_port(INTERFACE_DDF_CLIENT,
             devman_connection_client, NULL, &port);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Error creating DDF client port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
         
         rc = async_create_port(INTERFACE_DEVMAN_DEVICE,
             devman_connection_device, NULL, &port);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Error creating devman device port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
         
         rc = async_create_port(INTERFACE_DEVMAN_PARENT,
             devman_connection_parent, NULL, &port);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Error creating devman parent port: %s\n", NAME, str_error(rc));
+                return rc;
+        }
         
         async_set_fallback_port_handler(devman_forward, NULL);
@@ -357 +366 @@
         rc = service_register(SERVICE_DEVMAN);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering as a service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering as a service: %s", str_error(rc));
                 return rc;
         }