Changes in uspace/srv/devman/devman.c [96b02eb9:463e734] in mainline

File:

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

uspace/srv/devman/devman.c

@@ -498 +498 @@
  * @param phone         The phone to the driver.
  */
-void set_driver_phone(driver_t *driver, sysarg_t phone)
+void set_driver_phone(driver_t *driver, ipcarg_t phone)
 {
         fibril_mutex_lock(&driver->driver_mutex);
@@ -678 +678 @@
 }
 
+static FIBRIL_MUTEX_INITIALIZE(add_device_guard);
+
 /** Pass a device to running driver.
  *
@@ -685 +687 @@
 void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree)
 {
+        fibril_mutex_lock(&add_device_guard);
+
         /*
          * We do not expect to have driver's mutex locked as we do not
@@ -692 +696 @@
             node->name);
         
-        sysarg_t rc;
+        ipcarg_t rc;
         ipc_call_t answer;
         
@@ -715 +719 @@
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
+
+        fibril_mutex_unlock(&add_device_guard);
 
         switch(rc) {
@@ -760 +766 @@
                 start_driver(drv);
         }
+        fibril_mutex_unlock(&drv->driver_mutex);
+        
+        fibril_mutex_lock(&drv->driver_mutex);
         bool is_running = drv->state == DRIVER_RUNNING;
         fibril_mutex_unlock(&drv->driver_mutex);