Changeset 87b4baa in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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 mainline changes

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, ipcarg_t phone)
+void set_driver_phone(driver_t *driver, sysarg_t phone)
 {
         fibril_mutex_lock(&driver->driver_mutex);
@@ -678 +678 @@
 }
 
-static FIBRIL_MUTEX_INITIALIZE(add_device_guard);
-
 /** Pass a device to running driver.
  *
@@ -687 +685 @@
 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
@@ -696 +692 @@
             node->name);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         
@@ -719 +715 @@
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
-
-        fibril_mutex_unlock(&add_device_guard);
 
         switch(rc) {
@@ -766 +760 @@
                 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);