Changeset 17279ead in mainline

Timestamp:

2011-04-09T09:39:07Z (13 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.

Location:

uspace

Files:

• lib/drv/generic/driver.c (modified) (3 diffs)
• srv/devman/devman.c (modified) (2 diffs)
• srv/devman/devman.h (modified) (2 diffs)
• srv/devman/main.c (modified) (6 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();
         

uspace/srv/devman/devman.c

@@ -555 +555 @@
 }
 
-/** Remember the driver's phone.
- *
- * @param driver        The driver.
- * @param phone         The phone to the driver.
- */
-void set_driver_phone(driver_t *driver, sysarg_t phone)
-{
-        fibril_mutex_lock(&driver->driver_mutex);
-        assert(driver->state == DRIVER_STARTING);
-        driver->phone = phone;
-        fibril_mutex_unlock(&driver->driver_mutex);
-}
-
 /** Notify driver about the devices to which it was assigned.
  *
@@ -685 +672 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
+        drv->phone = -1;
 }
 

uspace/srv/devman/devman.h

@@ -88 +88 @@
         
         /** Phone asociated with this driver. */
-        sysarg_t phone;
+        int phone;
         /** Name of the device driver. */
         char *name;
@@ -316 +316 @@
 
 extern driver_t *find_driver(driver_list_t *, const char *);
-extern void set_driver_phone(driver_t *, sysarg_t);
 extern void initialize_running_driver(driver_t *, dev_tree_t *);
 

uspace/srv/devman/main.c

@@ -95 +95 @@
         /* Find driver structure. */
         driver = find_driver(&drivers_list, drv_name);
-        
         if (driver == NULL) {
                 log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name);
@@ -107 +106 @@
         drv_name = NULL;
         
+        fibril_mutex_lock(&driver->driver_mutex);
+        
+        if (driver->phone >= 0) {
+                /* We already have a connection to the driver. */
+                log_msg(LVL_ERROR, "Driver '%s' already started.\n",
+                    driver->name);
+                fibril_mutex_unlock(&driver->driver_mutex);
+                async_answer_0(iid, EEXISTS);
+                return NULL;
+        }
+        
+        switch (driver->state) {
+        case DRIVER_NOT_STARTED:
+                /* Somebody started the driver manually. */
+                log_msg(LVL_NOTE, "Driver '%s' started manually.\n",
+                    driver->name);
+                driver->state = DRIVER_STARTING;
+                break;
+        case DRIVER_STARTING:
+                /* The expected case */
+                break;
+        case DRIVER_RUNNING:
+                /* Should not happen since we do not have a connected phone */
+                assert(false);
+        }
+        
         /* Create connection to the driver. */
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
@@ -113 +138 @@
         ipc_callid_t callid = async_get_call(&call);
         if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+                fibril_mutex_unlock(&driver->driver_mutex);
                 async_answer_0(callid, ENOTSUP);
                 async_answer_0(iid, ENOTSUP);
@@ -119 +145 @@
         
         /* Remember driver's phone. */
-        set_driver_phone(driver, IPC_GET_ARG5(call));
+        driver->phone = IPC_GET_ARG5(call);
+        
+        fibril_mutex_unlock(&driver->driver_mutex);
         
         log_msg(LVL_NOTE, 
@@ -578 +606 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone <= 0) {
+        if (driver->phone < 0) {
                 log_msg(LVL_ERROR, 
                     "Could not forward to driver `%s' (phone is %d).",
@@ -618 +646 @@
         dev = fun->dev;
         
-        if (dev->state != DEVICE_USABLE || dev->drv->phone <= 0) {
+        if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) {
                 async_answer_0(iid, EINVAL);
                 return;