Changeset 17279ead in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-04-09T09:39:07Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

89c57b6, 969d88e, a7de7182, b2fb47f, b77ce84

Parents:

53debe0 (diff), 26fa82bc (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 devman improvements.

File:

• uspace/lib/drv/generic/driver.c (modified) (3 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>
@@ -655 +656 @@
 int ddf_driver_main(driver_t *drv)
 {
+        int rc;
+
         /*
          * Remember the driver structure - driver_ops will be called by generic
@@ -668 +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();