Changes in uspace/srv/devman/devman.c [79ae36dd:3ad7b1c] in mainline

File:

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

uspace/srv/devman/devman.c

@@ -39 +39 @@
 #include <devmap.h>
 #include <str_error.h>
-#include <stdio.h>
 
 #include "devman.h"
@@ -564 +563 @@
         dev_node_t *dev;
         link_t *link;
+        int phone;
 
         log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
@@ -569 +569 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-        
-        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) {
+
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+
+        if (phone < 0) {
                 fibril_mutex_unlock(&driver->driver_mutex);
                 return;
@@ -604 +601 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(sess, driver, dev, tree);
+                add_device(phone, driver, dev, tree);
 
                 /*
@@ -625 +622 @@
         }
 
-        async_hangup(sess);
+        async_hangup(phone);
 
         /*
@@ -675 +672 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->sess = NULL;
+        drv->phone = -1;
 }
 
@@ -739 +736 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
-    dev_tree_t *tree)
+void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -749 +745 @@
             drv->name, dev->pfun->name);
         
+        sysarg_t rc;
+        ipc_call_t answer;
+        
         /* Send the device to the driver. */
         devman_handle_t parent_handle;
@@ -756 +755 @@
                 parent_handle = 0;
         }
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle,
+
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle,
             parent_handle, &answer);
         
-        /* Send the device name to the driver. */
-        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
+        /* Send the device's name to the driver. */
+        rc = async_data_write_start(phone, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
-        
-        async_exchange_end(exch);
-        
         if (rc != EOK) {
                 /* TODO handle error */
@@ -829 +822 @@
         if (is_running) {
                 /* Notify the driver about the new device. */
-                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);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone >= 0) {
+                        add_device(phone, drv, dev, tree);
+                        async_hangup(phone);
                 }
         }