Changes in uspace/srv/devman/devman.c [45059d6b:d0dd7b5] in mainline

File:

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

uspace/srv/devman/devman.c

@@ -548 +548 @@
 
         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) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return;
+        }
 
         /*
@@ -573 +583 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(driver, dev, tree);
+                add_device(sess, driver, dev, tree);
 
                 /*
@@ -593 +603 @@
                 link = driver->devices.head.next;
         }
+
+        async_hangup(sess);
 
         /*
@@ -706 +718 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(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)
 {
         /*
@@ -723 +736 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(drv->sess);
+        async_exch_t *exch = async_exchange_begin(sess);
         
         ipc_call_t answer;
@@ -793 +806 @@
         fibril_mutex_unlock(&drv->driver_mutex);
 
-        /* Notify the driver about the new device. */
-        if (is_running)
-                add_device(drv, dev, tree);
+        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);
+                }
+        }
         
         return true;
@@ -897 +919 @@
         return dev;
 }
-
-/** Get list of device functions. */
-int dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
-    devman_handle_t *hdl_buf, size_t buf_size, size_t *act_size)
-{
-        size_t act_cnt;
-        size_t buf_cnt;
-
-        assert(fibril_rwlock_is_locked(&tree->rwlock));
-
-        buf_cnt = buf_size / sizeof(devman_handle_t);
-
-        act_cnt = list_count(&dev->functions);
-        *act_size = act_cnt * sizeof(devman_handle_t);
-
-        if (buf_size % sizeof(devman_handle_t) != 0)
-                return EINVAL;
-
-        size_t pos = 0;
-        list_foreach(dev->functions, item) {
-                fun_node_t *fun =
-                    list_get_instance(item, fun_node_t, dev_functions);
-
-                if (pos < buf_cnt)
-                        hdl_buf[pos] = fun->handle;
-                pos++;
-        }
-
-        return EOK;
-}
-
 
 /* Function nodes */
@@ -1154 +1145 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[1] != '\0');
+        bool cont = true;
         
         while (cont && fun != NULL) {