Changeset 1affcdf3 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (9 diffs)

uspace/srv/devman/devman.c

@@ -564 +564 @@
         dev_node_t *dev;
         link_t *link;
-        int phone;
 
         log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
@@ -570 +569 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-
-        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-
-        if (phone < 0) {
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+            DRIVER_DEVMAN, 0, 0);
+        async_exchange_end(exch);
+
+        if (!sess) {
                 fibril_mutex_unlock(&driver->driver_mutex);
                 return;
@@ -602 +604 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(phone, driver, dev, tree);
+                add_device(sess, driver, dev, tree);
 
                 /*
@@ -623 +625 @@
         }
 
-        async_hangup(phone);
+        async_hangup(sess);
 
         /*
@@ -673 +675 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->phone = -1;
+        drv->sess = NULL;
 }
 
@@ -737 +739 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
+void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
+    dev_tree_t *tree)
 {
         /*
@@ -746 +749 @@
             drv->name, dev->pfun->name);
         
-        sysarg_t rc;
-        ipc_call_t answer;
-        
         /* Send the device to the driver. */
         devman_handle_t parent_handle;
@@ -756 +756 @@
                 parent_handle = 0;
         }
-
-        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle,
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle,
             parent_handle, &answer);
         
-        /* Send the device's name to the driver. */
-        rc = async_data_write_start(phone, dev->pfun->name,
+        /* Send the device name to the driver. */
+        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
+        
+        async_exchange_end(exch);
+        
         if (rc != EOK) {
                 /* TODO handle error */
@@ -823 +829 @@
         if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
-                if (phone >= 0) {
-                        add_device(phone, drv, dev, tree);
-                        async_hangup(phone);
+                async_exch_t *exch = async_exchange_begin(drv->sess);
+                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+                    DRIVER_DEVMAN, 0, 0);
+                async_exchange_end(exch);
+                
+                if (sess) {
+                        add_device(sess, drv, dev, tree);
+                        async_hangup(sess);
                 }
         }