Changeset a39cfb8 in mainline for uspace/srv/devman/main.c

Timestamp:

2011-04-14T07:54:33Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 from development

File:

• uspace/srv/devman/main.c (modified) (6 diffs)

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, 
@@ -579 +607 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone <= 0) {
+        if (driver->phone < 0) {
                 log_msg(LVL_ERROR, 
                     "Could not forward to driver `%s' (phone is %d).",
@@ -619 +647 @@
         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;