Changes in uspace/lib/drv/generic/driver.c [2a770a35:26fa82bc] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (5 diffs)

uspace/lib/drv/generic/driver.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ctype.h>
 #include <errno.h>
@@ -273 +274 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (res == EOK) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
-                    driver->name, dev_handle);
-        } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
-                    driver->name, dev_handle);
+        if (res != EOK)
                 delete_device(dev);
-        }
         
         async_answer_0(iid, res);
@@ -408 +403 @@
                             get_remote_method(rem_iface, iface_method_idx);
                         if (iface_method_ptr == NULL) {
-                                // the interface has not such method
+                                /* The interface has not such method */
                                 printf("%s: driver_connection_gen error - "
                                     "invalid interface method.", driver->name);
@@ -661 +656 @@
 int ddf_driver_main(driver_t *drv)
 {
+        int rc;
+
         /*
          * Remember the driver structure - driver_ops will be called by generic
@@ -674 +671 @@
         
         /*
-         * Register driver by device manager with generic handler for incoming
-         * connections.
+         * Register driver with device manager using generic handler for
+         * incoming connections.
          */
-        devman_driver_register(driver->name, driver_connection);
-        
+        rc = devman_driver_register(driver->name, driver_connection);
+        if (rc != EOK) {
+                printf("Error: Failed to register driver with device manager "
+                    "(%s).\n", (rc == EEXISTS) ? "driver already started" :
+                    str_error(rc));
+                
+                return 1;
+        }
+        
+        /* Return success from the task since server has started. */
+        rc = task_retval(0);
+        if (rc != EOK)
+                return 1;
+
         async_manager();