Changes in uspace/srv/devman/main.c [3ad7b1c:ebcb05a] in mainline

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);
@@ -106 +107 @@
         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.",
@@ -138 +113 @@
         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);
@@ -145 +119 @@
         
         /* Remember driver's phone. */
-        driver->phone = IPC_GET_ARG5(call);
-        
-        fibril_mutex_unlock(&driver->driver_mutex);
+        set_driver_phone(driver, IPC_GET_ARG5(call));
         
         log_msg(LVL_NOTE, 
@@ -606 +578 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone < 0) {
+        if (driver->phone <= 0) {
                 log_msg(LVL_ERROR, 
                     "Could not forward to driver `%s' (phone is %d).",
@@ -646 +618 @@
         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;