Changeset d1e196f7 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-08-21T12:04:27Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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) (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;
-        }
 
         /*
@@ -583 +573 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(sess, driver, dev, tree);
+                add_device(driver, dev, tree);
 
                 /*
@@ -603 +593 @@
                 link = driver->devices.head.next;
         }
-
-        async_hangup(sess);
 
         /*
@@ -718 +706 @@
  * @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(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -736 +723 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(sess);
+        async_exch_t *exch = async_exchange_begin(drv->sess);
         
         ipc_call_t answer;
@@ -806 +793 @@
         fibril_mutex_unlock(&drv->driver_mutex);
 
-        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);
-                }
-        }
+        /* Notify the driver about the new device. */
+        if (is_running)
+                add_device(drv, dev, tree);
         
         return true;
@@ -919 +897 @@
         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 */
@@ -1145 +1154 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = true;
+        bool cont = (rel_path[1] != '\0');
         
         while (cont && fun != NULL) {