Changeset ba38f72c in mainline

Timestamp:

2011-02-07T22:15:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b367b4

Parents:

8b5690f

Message:

Split device tree node into dev_node_t (device node) and fun_node_t (function node).

Location:

uspace/srv/devman

Files:

• devman.c (modified) (34 diffs)
• devman.h (modified) (13 diffs)
• main.c (modified) (19 diffs)
• match.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -41 +41 @@
 #include "devman.h"
 
+fun_node_t *find_node_child(fun_node_t *parent, const char *name);
+
 /* hash table operations */
 
@@ -51 +53 @@
     link_t *item)
 {
-        node_t *dev = hash_table_get_instance(item, node_t, devman_link);
+        dev_node_t *dev = hash_table_get_instance(item, dev_node_t, devman_dev);
         return (dev->handle == (devman_handle_t) key[0]);
 }
 
-static int devmap_devices_compare(unsigned long key[], hash_count_t keys,
+static int devman_functions_compare(unsigned long key[], hash_count_t keys,
     link_t *item)
 {
-        node_t *dev = hash_table_get_instance(item, node_t, devmap_link);
-        return (dev->devmap_handle == (devmap_handle_t) key[0]);
+        fun_node_t *fun = hash_table_get_instance(item, fun_node_t, devman_fun);
+        return (fun->handle == (devman_handle_t) key[0]);
+}
+
+static int devmap_functions_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        fun_node_t *fun = hash_table_get_instance(item, fun_node_t, devmap_fun);
+        return (fun->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -82 +91 @@
 };
 
+static hash_table_operations_t devman_functions_ops = {
+        .hash = devices_hash,
+        .compare = devman_functions_compare,
+        .remove_callback = devices_remove_callback
+};
+
 static hash_table_operations_t devmap_devices_ops = {
         .hash = devices_hash,
-        .compare = devmap_devices_compare,
+        .compare = devmap_functions_compare,
         .remove_callback = devices_remove_callback
 };
@@ -373 +388 @@
 }
 
-/** Create root device node in the device tree.
+/** Create root device and function node in the device tree.
  *
  * @param tree  The device tree.
  * @return      True on success, false otherwise.
  */
-bool create_root_node(dev_tree_t *tree)
-{
-        node_t *node;
-
-        printf(NAME ": create_root_node\n");
-
+bool create_root_nodes(dev_tree_t *tree)
+{
+        fun_node_t *fun;
+        dev_node_t *dev;
+        
+        printf(NAME ": create_root_nodes\n");
+        
         fibril_rwlock_write_lock(&tree->rwlock);
-        node = create_dev_node();
-        if (node != NULL) {
-                insert_dev_node(tree, node, clone_string(""), NULL);
-                match_id_t *id = create_match_id();
-                id->id = clone_string("root");
-                id->score = 100;
-                add_match_id(&node->match_ids, id);
-                tree->root_node = node;
-        }
+        
+        /*
+         * Create root function. This is a pseudo function to which
+         * the root device node is attached. It allows us to match
+         * the root device driver in a standard manner, i.e. against
+         * the parent function.
+         */
+        
+        fun = create_fun_node();
+        if (fun == NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                return false;
+        }
+        
+        insert_fun_node(tree, fun, clone_string(""), NULL);
+        match_id_t *id = create_match_id();
+        id->id = clone_string("root");
+        id->score = 100;
+        add_match_id(&fun->match_ids, id);
+        tree->root_node = fun;
+        
+        /*
+         * Create root device node.
+         */
+        dev = create_dev_node();
+        if (dev == NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                return false;
+        }
+        
+        insert_dev_node(tree, dev, fun);
+        
         fibril_rwlock_write_unlock(&tree->rwlock);
-
-        return node != NULL;
+        
+        return dev != NULL;
 }
 
@@ -414 +453 @@
  *                      is found.
  */
-driver_t *find_best_match_driver(driver_list_t *drivers_list, node_t *node)
+driver_t *find_best_match_driver(driver_list_t *drivers_list, dev_node_t *node)
 {
         driver_t *best_drv = NULL, *drv = NULL;
@@ -442 +481 @@
  * @param drv           The driver.
  */
-void attach_driver(node_t *node, driver_t *drv)
+void attach_driver(dev_node_t *dev, driver_t *drv)
 {
         printf(NAME ": attach_driver %s to device %s\n",
-            drv->name, node->pathname);
+            drv->name, dev->pfun->pathname);
         
         fibril_mutex_lock(&drv->driver_mutex);
         
-        node->drv = drv;
-        list_append(&node->driver_devices, &drv->devices);
+        dev->drv = drv;
+        list_append(&dev->driver_devices, &drv->devices);
         
         fibril_mutex_unlock(&drv->driver_mutex);
@@ -530 +569 @@
 static void pass_devices_to_driver(driver_t *driver, dev_tree_t *tree)
 {
-        node_t *dev;
+        dev_node_t *dev;
         link_t *link;
         int phone;
@@ -551 +590 @@
         link = driver->devices.next;
         while (link != &driver->devices) {
-                dev = list_get_instance(link, node_t, driver_devices);
+                dev = list_get_instance(link, dev_node_t, driver_devices);
                 if (dev->passed_to_driver) {
                         link = link->next;
@@ -669 +708 @@
 }
 
-/** Create devmap path and name for the device. */
-static void devmap_register_tree_device(node_t *node, dev_tree_t *tree)
+/** Create devmap path and name for the function. */
+static void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
 {
         char *devmap_pathname = NULL;
         char *devmap_name = NULL;
         
-        asprintf(&devmap_name, "%s", node->pathname);
+        asprintf(&devmap_name, "%s", fun->pathname);
         if (devmap_name == NULL)
                 return;
@@ -689 +728 @@
         
         devmap_device_register_with_iface(devmap_pathname,
-            &node->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
-        
-        tree_add_devmap_device(tree, node);
+            &fun->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        
+        tree_add_devmap_function(tree, fun);
         
         free(devmap_name);
@@ -702 +741 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree)
+void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -709 +748 @@
          */
         printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
-            node->name);
+            dev->pfun->name);
         
         sysarg_t rc;
@@ -716 +755 @@
         /* Send the device to the driver. */
         devman_handle_t parent_handle;
-        if (node->parent) {
-                parent_handle = node->parent->handle;
+        if (dev->pfun) {
+                parent_handle = dev->pfun->handle;
         } else {
                 parent_handle = 0;
         }
 
-        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle,
             parent_handle, &answer);
         
         /* Send the device's name to the driver. */
-        rc = async_data_write_start(phone, node->name,
-            str_size(node->name) + 1);
+        rc = async_data_write_start(phone, dev->pfun->name,
+            str_size(dev->pfun->name) + 1);
         if (rc != EOK) {
                 /* TODO handle error */
@@ -737 +776 @@
         switch(rc) {
         case EOK:
-                node->state = DEVICE_USABLE;
-                devmap_register_tree_device(node, tree);
+                dev->state = DEVICE_USABLE;
+                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+                if (0) devmap_register_tree_function(NULL, tree);
+                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                 break;
         case ENOENT:
-                node->state = DEVICE_NOT_PRESENT;
+                dev->state = DEVICE_NOT_PRESENT;
                 break;
         default:
-                node->state = DEVICE_INVALID;
-        }
-        
-        node->passed_to_driver = true;
+                dev->state = DEVICE_INVALID;
+        }
+        
+        dev->passed_to_driver = true;
 
         return;
@@ -759 +800 @@
  *                      successfully assigned to the device, false otherwise.
  */
-bool assign_driver(node_t *node, driver_list_t *drivers_list, dev_tree_t *tree)
-{
+bool assign_driver(dev_node_t *dev, driver_list_t *drivers_list,
+    dev_tree_t *tree)
+{
+        assert(dev != NULL);
+        assert(drivers_list != NULL);
+        assert(tree != NULL);
+        
         /*
          * Find the driver which is the most suitable for handling this device.
          */
-        driver_t *drv = find_best_match_driver(drivers_list, node);
+        driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
                 printf(NAME ": no driver found for device '%s'.\n",
-                    node->pathname);
+                    dev->pfun->pathname);
                 return false;
         }
         
         /* Attach the driver to the device. */
-        attach_driver(node, drv);
+        attach_driver(dev, drv);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -786 +832 @@
                 int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
                 if (phone >= 0) {
-                        add_device(phone, drv, node, tree);
+                        add_device(phone, drv, dev, tree);
                         async_hangup(phone);
                 }
@@ -810 +856 @@
         hash_table_create(&tree->devman_devices, DEVICE_BUCKETS, 1,
             &devman_devices_ops);
-        hash_table_create(&tree->devmap_devices, DEVICE_BUCKETS, 1,
+        hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1,
+            &devman_functions_ops);
+        hash_table_create(&tree->devmap_functions, DEVICE_BUCKETS, 1,
             &devmap_devices_ops);
         
         fibril_rwlock_initialize(&tree->rwlock);
         
-        /* Create root node and add it to the device tree. */
-        if (!create_root_node(tree))
+        /* Create root function and root device and add them to the device tree. */
+        if (!create_root_nodes(tree))
                 return false;
 
         /* Find suitable driver and start it. */
-        return assign_driver(tree->root_node, drivers_list, tree);
+        return assign_driver(tree->root_node->child, drivers_list, tree);
 }
 
@@ -829 +877 @@
  * @return              A device node structure.
  */
-node_t *create_dev_node(void)
-{
-        node_t *res = malloc(sizeof(node_t));
+dev_node_t *create_dev_node(void)
+{
+        dev_node_t *res = malloc(sizeof(dev_node_t));
         
         if (res != NULL) {
-                memset(res, 0, sizeof(node_t));
-                list_initialize(&res->children);
-                list_initialize(&res->match_ids.ids);
-                list_initialize(&res->classes);
+                memset(res, 0, sizeof(dev_node_t));
+                list_initialize(&res->functions);
+                link_initialize(&res->driver_devices);
+                link_initialize(&res->devman_dev);
         }
         
@@ -847 +895 @@
  * @param node          The device node structure.
  */
-void delete_dev_node(node_t *node)
-{
-        assert(list_empty(&node->children));
-        assert(node->parent == NULL);
-        assert(node->drv == NULL);
-        
-        clean_match_ids(&node->match_ids);
-        free_not_null(node->name);
-        free_not_null(node->pathname);
-        free(node);
+void delete_dev_node(dev_node_t *dev)
+{
+        assert(list_empty(&dev->functions));
+        assert(dev->pfun == NULL);
+        assert(dev->drv == NULL);
+        
+        free(dev);
 }
 
@@ -865 +910 @@
  * @return              The device node.
  */
-node_t *find_dev_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
+dev_node_t *find_dev_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
 {
         unsigned long key = handle;
@@ -873 +918 @@
         
         link = hash_table_find(&tree->devman_devices, &key);
-        return hash_table_get_instance(link, node_t, devman_link);
+        return hash_table_get_instance(link, dev_node_t, devman_dev);
 }
 
@@ -882 +927 @@
  * @return              The device node.
  */
-node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle)
-{
-        node_t *node = NULL;
+dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle)
+{
+        dev_node_t *dev = NULL;
         
         fibril_rwlock_read_lock(&tree->rwlock);
-        node = find_dev_node_no_lock(tree, handle);
+        dev = find_dev_node_no_lock(tree, handle);
         fibril_rwlock_read_unlock(&tree->rwlock);
         
-        return node;
-}
-
+        return dev;
+}
+
+/* Function nodes */
+
+/** Create a new function node.
+ *
+ * @return              A function node structure.
+ */
+fun_node_t *create_fun_node(void)
+{
+        fun_node_t *res = malloc(sizeof(fun_node_t));
+        
+        if (res != NULL) {
+                memset(res, 0, sizeof(fun_node_t));
+                link_initialize(&res->dev_functions);
+                list_initialize(&res->match_ids.ids);
+                list_initialize(&res->classes);
+                link_initialize(&res->devman_fun);
+                link_initialize(&res->devmap_fun);
+        }
+        
+        return res;
+}
+
+/** Delete a function node.
+ *
+ * @param fun           The device node structure.
+ */
+void delete_fun_node(fun_node_t *fun)
+{
+        assert(fun->dev == NULL);
+        assert(fun->child == NULL);
+        
+        clean_match_ids(&fun->match_ids);
+        free_not_null(fun->name);
+        free_not_null(fun->pathname);
+        free(fun);
+}
+
+/** Find the function node with the specified handle.
+ *
+ * @param tree          The device tree where we look for the device node.
+ * @param handle        The handle of the function.
+ * @return              The function node.
+ */
+fun_node_t *find_fun_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
+{
+        unsigned long key = handle;
+        link_t *link;
+        
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
+        
+        link = hash_table_find(&tree->devman_functions, &key);
+        if (link == NULL)
+                return NULL;
+        
+        return hash_table_get_instance(link, fun_node_t, devman_fun);
+}
+
+/** Find the function node with the specified handle.
+ *
+ * @param tree          The device tree where we look for the device node.
+ * @param handle        The handle of the function.
+ * @return              The function node.
+ */
+fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle)
+{
+        fun_node_t *fun = NULL;
+        
+        fibril_rwlock_read_lock(&tree->rwlock);
+        fun = find_fun_node_no_lock(tree, handle);
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        return fun;
+}
 
 /** Create and set device's full path in device tree.
@@ -901 +1019 @@
  *                      resources etc.).
  */
-static bool set_dev_path(node_t *node, node_t *parent)
-{
-        assert(node->name != NULL);
-        
-        size_t pathsize = (str_size(node->name) + 1);
+static bool set_fun_path(fun_node_t *fun, fun_node_t *parent)
+{
+        assert(fun->name != NULL);
+        
+        size_t pathsize = (str_size(fun->name) + 1);
         if (parent != NULL)
                 pathsize += str_size(parent->pathname) + 1;
         
-        node->pathname = (char *) malloc(pathsize);
-        if (node->pathname == NULL) {
+        fun->pathname = (char *) malloc(pathsize);
+        if (fun->pathname == NULL) {
                 printf(NAME ": failed to allocate device path.\n");
                 return false;
@@ -916 +1034 @@
         
         if (parent != NULL) {
-                str_cpy(node->pathname, pathsize, parent->pathname);
-                str_append(node->pathname, pathsize, "/");
-                str_append(node->pathname, pathsize, node->name);
+                str_cpy(fun->pathname, pathsize, parent->pathname);
+                str_append(fun->pathname, pathsize, "/");
+                str_append(fun->pathname, pathsize, fun->name);
         } else {
-                str_cpy(node->pathname, pathsize, node->name);
+                str_cpy(fun->pathname, pathsize, fun->name);
         }
         
@@ -936 +1054 @@
  *                      etc.).
  */
-bool insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name,
-    node_t *parent)
-{
-        assert(node != NULL);
+bool insert_dev_node(dev_tree_t *tree, dev_node_t *dev, fun_node_t *pfun)
+{
+        assert(dev != NULL);
         assert(tree != NULL);
-        assert(dev_name != NULL);
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
-        node->name = dev_name;
-        if (!set_dev_path(node, parent)) {
+        /* Add the node to the handle-to-node map. */
+        dev->handle = ++tree->current_handle;
+        unsigned long key = dev->handle;
+        hash_table_insert(&tree->devman_devices, &key, &dev->devman_dev);
+
+        /* Add the node to the list of its parent's children. */
+        printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun);
+        dev->pfun = pfun;
+        pfun->child = dev;
+        
+        return true;
+}
+
+/** Insert new function into device tree.
+ *
+ * @param tree          The device tree.
+ * @param node          The newly added function node. 
+ * @param dev_name      The name of the newly added function.
+ * @param parent        Owning device node.
+ *
+ * @return              True on success, false otherwise (insufficient resources
+ *                      etc.).
+ */
+bool insert_fun_node(dev_tree_t *tree, fun_node_t *fun, char *fun_name,
+    dev_node_t *dev)
+{
+        fun_node_t *pfun;
+        
+        assert(fun != NULL);
+        assert(tree != NULL);
+        assert(fun_name != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        /*
+         * The root function is a special case, it does not belong to any
+         * device so for the root function dev == NULL.
+         */
+        pfun = (dev != NULL) ? dev->pfun : NULL;
+        
+        fun->name = fun_name;
+        if (!set_fun_path(fun, pfun)) {
                 return false;
         }
         
         /* Add the node to the handle-to-node map. */
-        node->handle = ++tree->current_handle;
-        unsigned long key = node->handle;
-        hash_table_insert(&tree->devman_devices, &key, &node->devman_link);
+        fun->handle = ++tree->current_handle;
+        unsigned long key = fun->handle;
+        hash_table_insert(&tree->devman_functions, &key, &fun->devman_fun);
 
         /* Add the node to the list of its parent's children. */
-        node->parent = parent;
-        if (parent != NULL)
-                list_append(&node->sibling, &parent->children);
+        fun->dev = dev;
+        if (dev != NULL)
+                list_append(&fun->dev_functions, &dev->functions);
         
         return true;
 }
 
-/** Find device node with a specified path in the device tree.
+/** Find function node with a specified path in the device tree.
  * 
- * @param path          The path of the device node in the device tree.
+ * @param path          The path of the function node in the device tree.
  * @param tree          The device tree.
- * @return              The device node if it is present in the tree, NULL
+ * @return              The function node if it is present in the tree, NULL
  *                      otherwise.
  */
-node_t *find_dev_node_by_path(dev_tree_t *tree, char *path)
+fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
         fibril_rwlock_read_lock(&tree->rwlock);
         
-        node_t *dev = tree->root_node;
+        fun_node_t *fun = tree->root_node;
         /*
-         * Relative path to the device from its parent (but with '/' at the
+         * Relative path to the function from its parent (but with '/' at the
          * beginning)
          */
@@ -982 +1137 @@
         bool cont = (rel_path[0] == '/');
         
-        while (cont && dev != NULL) {
+        while (cont && fun != NULL) {
                 next_path_elem  = get_path_elem_end(rel_path + 1);
                 if (next_path_elem[0] == '/') {
@@ -991 +1146 @@
                 }
                 
-                dev = find_node_child(dev, rel_path + 1);
+                fun = find_node_child(fun, rel_path + 1);
                 
                 if (cont) {
@@ -1002 +1157 @@
         fibril_rwlock_read_unlock(&tree->rwlock);
         
-        return dev;
-}
-
-/** Find child device node with a specified name.
+        return fun;
+}
+
+/** Find child function node with a specified name.
  *
  * Device tree rwlock should be held at least for reading.
  *
- * @param parent        The parent device node.
- * @param name          The name of the child device node.
- * @return              The child device node.
- */
-node_t *find_node_child(node_t *parent, const char *name)
-{
-        node_t *dev;
+ * @param parent        The parent function node.
+ * @param name          The name of the child function.
+ * @return              The child function node.
+ */
+fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
+{
+        fun_node_t *fun;
         link_t *link;
         
-        link = parent->children.next;
-        
-        while (link != &parent->children) {
-                dev = list_get_instance(link, node_t, sibling);
+        link = pfun->child->functions.next;
+        
+        while (link != &pfun->child->functions) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
                 
-                if (str_cmp(name, dev->name) == 0)
-                        return dev;
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
                 
                 link = link->next;
@@ -1107 +1262 @@
 }
 
-/** Add the device to the class.
+/** Add the device function to the class.
  *
  * The device may be added to multiple classes and a class may contain multiple
@@ -1120 +1275 @@
  *                      with the class.
  */
-dev_class_info_t *add_device_to_class(node_t *dev, dev_class_t *cl,
+dev_class_info_t *add_function_to_class(fun_node_t *fun, dev_class_t *cl,
     const char *base_dev_name)
 {
-        dev_class_info_t *info = create_dev_class_info();
+        dev_class_info_t *info;
+
+        assert(fun != NULL);
+        assert(cl != NULL);
+
+        info = create_dev_class_info();
+
         
         if (info != NULL) {
                 info->dev_class = cl;
-                info->dev = dev;
+                info->fun = fun;
                 
                 /* Add the device to the class. */
@@ -1135 +1296 @@
                 
                 /* Add the class to the device. */
-                list_append(&info->dev_classes, &dev->classes);
+                list_append(&info->dev_classes, &fun->classes);
                 
                 /* Create unique name for the device within the class. */
@@ -1189 +1350 @@
         list_initialize(&class_list->classes);
         fibril_rwlock_initialize(&class_list->rwlock);
-        hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
+        hash_table_create(&class_list->devmap_functions, DEVICE_BUCKETS, 1,
             &devmap_devices_class_ops);
 }
@@ -1196 +1357 @@
 /* Devmap devices */
 
-node_t *find_devmap_tree_device(dev_tree_t *tree, devmap_handle_t devmap_handle)
-{
-        node_t *dev = NULL;
+fun_node_t *find_devmap_tree_function(dev_tree_t *tree, devmap_handle_t devmap_handle)
+{
+        fun_node_t *fun = NULL;
         link_t *link;
         unsigned long key = (unsigned long) devmap_handle;
         
         fibril_rwlock_read_lock(&tree->rwlock);
-        link = hash_table_find(&tree->devmap_devices, &key);
+        link = hash_table_find(&tree->devmap_functions, &key);
         if (link != NULL)
-                dev = hash_table_get_instance(link, node_t, devmap_link);
+                fun = hash_table_get_instance(link, fun_node_t, devmap_fun);
         fibril_rwlock_read_unlock(&tree->rwlock);
         
-        return dev;
-}
-
-node_t *find_devmap_class_device(class_list_t *classes,
+        return fun;
+}
+
+fun_node_t *find_devmap_class_function(class_list_t *classes,
     devmap_handle_t devmap_handle)
 {
-        node_t *dev = NULL;
+        fun_node_t *fun = NULL;
         dev_class_info_t *cli;
         link_t *link;
@@ -1220 +1381 @@
         
         fibril_rwlock_read_lock(&classes->rwlock);
-        link = hash_table_find(&classes->devmap_devices, &key);
+        link = hash_table_find(&classes->devmap_functions, &key);
         if (link != NULL) {
                 cli = hash_table_get_instance(link, dev_class_info_t,
                     devmap_link);
-                dev = cli->dev;
+                fun = cli->fun;
         }
         fibril_rwlock_read_unlock(&classes->rwlock);
         
-        return dev;
-}
-
-void class_add_devmap_device(class_list_t *class_list, dev_class_info_t *cli)
+        return fun;
+}
+
+void class_add_devmap_function(class_list_t *class_list, dev_class_info_t *cli)
 {
         unsigned long key = (unsigned long) cli->devmap_handle;
         
         fibril_rwlock_write_lock(&class_list->rwlock);
-        hash_table_insert(&class_list->devmap_devices, &key, &cli->devmap_link);
+        hash_table_insert(&class_list->devmap_functions, &key, &cli->devmap_link);
         fibril_rwlock_write_unlock(&class_list->rwlock);
 
-        assert(find_devmap_class_device(class_list, cli->devmap_handle) != NULL);
-}
-
-void tree_add_devmap_device(dev_tree_t *tree, node_t *node)
-{
-        unsigned long key = (unsigned long) node->devmap_handle;
+        assert(find_devmap_class_function(class_list, cli->devmap_handle) != NULL);
+}
+
+void tree_add_devmap_function(dev_tree_t *tree, fun_node_t *fun)
+{
+        unsigned long key = (unsigned long) fun->devmap_handle;
         fibril_rwlock_write_lock(&tree->rwlock);
-        hash_table_insert(&tree->devmap_devices, &key, &node->devmap_link);
+        hash_table_insert(&tree->devmap_functions, &key, &fun->devmap_fun);
         fibril_rwlock_write_unlock(&tree->rwlock);
 }

uspace/srv/devman/devman.h

@@ -56 +56 @@
 #define DEVMAP_SEPARATOR '\\'
 
-struct node;
-typedef struct node node_t;
+struct dev_node;
+typedef struct dev_node dev_node_t;
+
+struct fun_node;
+typedef struct fun_node fun_node_t;
 
 typedef enum {
@@ -117 +120 @@
 } device_state_t;
 
-/** Representation of a node in the device tree. */
-struct node {
+/** Device node in the device tree. */
+struct dev_node {
         /** The global unique identifier of the device. */
         devman_handle_t handle;
-        /** The name of the device specified by its parent. */
-        char *name;
-        
-        /**
-         * Full path and name of the device in device hierarchi (i. e. in full
-         * path in device tree).
-         */
-        char *pathname;
-        
-        /** The node of the parent device. */
-        node_t *parent;
-        
-        /**
-         * Pointers to previous and next child devices in the linked list of
-         * parent device's node.
-         */
-        link_t sibling;
-        
-        /** List of child device nodes. */
-        link_t children;
-        /** List of device ids for device-to-driver matching. */
-        match_id_list_t match_ids;
+        
+        /** (Parent) function the device is attached to. */
+        fun_node_t *pfun;
+        
+        /** List of device functions. */
+        link_t functions;
         /** Driver of this device. */
         driver_t *drv;
         /** The state of the device. */
         device_state_t state;
-        /**
-         * Pointer to the previous and next device in the list of devices
-         * owned by one driver.
-         */
+        /** Link to list of devices owned by driver (driver_t.devices) */
         link_t driver_devices;
         
-        /** The list of device classes to which this device belongs. */
-        link_t classes;
-        /** Devmap handle if the device is registered by devmapper. */
-        devmap_handle_t devmap_handle;
-        
         /**
          * Used by the hash table of devices indexed by devman device handles.
          */
-        link_t devman_link;
-        
-        /**
-         * Used by the hash table of devices indexed by devmap device handles.
-         */
-        link_t devmap_link;
-
+        link_t devman_dev;
+        
         /**
          * Whether this device was already passed to the driver.
@@ -173 +147 @@
         bool passed_to_driver;
 };
+
+/** Function node in the device tree. */
+struct fun_node {
+        /** The global unique identifier of the function */
+        devman_handle_t handle;
+        /** Name of the function, assigned by the device driver */
+        char *name;
+        
+        /** Full path and name of the device in device hierarchy */
+        char *pathname;
+        
+        /** Device which this function belongs to */
+        dev_node_t *dev;
+        
+        /** Link to list of functions in the device (device_t.functions) */
+        link_t dev_functions;
+        
+        /** Child device node (if any attached). */
+        dev_node_t *child;
+        /** List of device ids for device-to-driver matching. */
+        match_id_list_t match_ids;
+        
+        /** The list of device classes to which this device function belongs. */
+        link_t classes;
+        /** Devmap handle if the device function is registered by devmap. */
+        devmap_handle_t devmap_handle;
+        
+        /**
+         * Used by the hash table of functions indexed by devman device handles.
+         */
+        link_t devman_fun;
+        
+        /**
+         * Used by the hash table of functions indexed by devmap device handles.
+         */
+        link_t devmap_fun;
+};
+
 
 /** Represents device tree. */
 typedef struct dev_tree {
         /** Root device node. */
-        node_t *root_node;
+        fun_node_t *root_node;
         
         /**
@@ -191 +203 @@
         hash_table_t devman_devices;
         
+        /** Hash table of all devices indexed by devman handles. */
+        hash_table_t devman_functions;
+        
         /**
          * Hash table of devices registered by devmapper, indexed by devmap
          * handles.
          */
-        hash_table_t devmap_devices;
+        hash_table_t devmap_functions;
 } dev_tree_t;
 
@@ -227 +242 @@
 
 /**
- * Provides n-to-m mapping between device nodes and classes - each device may
- * be register to the arbitrary number of classes and each class may contain
- * the arbitrary number of devices.
+ * Provides n-to-m mapping between function nodes and classes - each function
+ * can register in an arbitrary number of classes and each class can contain
+ * an arbitrary number of device functions.
  */
 typedef struct dev_class_info {
@@ -235 +250 @@
         dev_class_t *dev_class;
         /** The device. */
-        node_t *dev;
+        fun_node_t *fun;
         
         /**
@@ -249 +264 @@
         link_t dev_classes;
         
-        /** The name of the device within the class. */
+        /** The name of the device function within the class. */
         char *dev_name;
         /** The handle of the device by device mapper in the class namespace. */
@@ -270 +285 @@
          * indexed by devmap handles.
          */
-        hash_table_t devmap_devices;
+        hash_table_t devmap_functions;
         
         /** Fibril mutex for list of classes. */
@@ -278 +293 @@
 /* Match ids and scores */
 
-extern int get_match_score(driver_t *, node_t *);
+extern int get_match_score(driver_t *, dev_node_t *);
 
 extern bool parse_match_ids(char *, match_id_list_t *);
@@ -292 +307 @@
 extern int lookup_available_drivers(driver_list_t *, const char *);
 
-extern driver_t *find_best_match_driver(driver_list_t *, node_t *);
-extern bool assign_driver(node_t *, driver_list_t *, dev_tree_t *);
+extern driver_t *find_best_match_driver(driver_list_t *, dev_node_t *);
+extern bool assign_driver(dev_node_t *, driver_list_t *, dev_tree_t *);
 
 extern void add_driver(driver_list_t *, driver_t *);
-extern void attach_driver(node_t *, driver_t *);
-extern void add_device(int, driver_t *, node_t *, dev_tree_t *);
+extern void attach_driver(dev_node_t *, driver_t *);
+extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
 
@@ -310 +325 @@
 /* Device nodes */
 
-extern node_t *create_dev_node(void);
-extern void delete_dev_node(node_t *node);
-extern node_t *find_dev_node_no_lock(dev_tree_t *tree,
+extern dev_node_t *create_dev_node(void);
+extern void delete_dev_node(dev_node_t *node);
+extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
     devman_handle_t handle);
-extern node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
-extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
-extern node_t *find_node_child(node_t *, const char *);
+extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
+extern dev_node_t *find_dev_function(dev_node_t *, const char *);
+
+extern fun_node_t *create_fun_node(void);
+extern void delete_fun_node(fun_node_t *);
+extern fun_node_t *find_fun_node_no_lock(dev_tree_t *tree,
+    devman_handle_t handle);
+extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
+extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
 
 /* Device tree */
 
 extern bool init_device_tree(dev_tree_t *, driver_list_t *);
-extern bool create_root_node(dev_tree_t *);
-extern bool insert_dev_node(dev_tree_t *, node_t *, char *, node_t *);
+extern bool create_root_nodes(dev_tree_t *);
+extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
+extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
 
 /* Device classes */
@@ -330 +352 @@
 extern size_t get_new_class_dev_idx(dev_class_t *);
 extern char *create_dev_name_for_class(dev_class_t *, const char *);
-extern dev_class_info_t *add_device_to_class(node_t *, dev_class_t *,
+extern dev_class_info_t *add_function_to_class(fun_node_t *, dev_class_t *,
     const char *);
 
@@ -341 +363 @@
 /* Devmap devices */
 
-extern node_t *find_devmap_tree_device(dev_tree_t *, devmap_handle_t);
-extern node_t *find_devmap_class_device(class_list_t *, devmap_handle_t);
-
-extern void class_add_devmap_device(class_list_t *, dev_class_info_t *);
-extern void tree_add_devmap_device(dev_tree_t *, node_t *);
+extern fun_node_t *find_devmap_tree_function(dev_tree_t *, devmap_handle_t);
+extern fun_node_t *find_devmap_class_function(class_list_t *, devmap_handle_t);
+
+extern void class_add_devmap_function(class_list_t *, dev_class_info_t *);
+extern void tree_add_devmap_function(dev_tree_t *, fun_node_t *);
 
 #endif

uspace/srv/devman/main.c

@@ -199 +199 @@
 static int assign_driver_fibril(void *arg)
 {
-        node_t *node = (node_t *) arg;
-        assign_driver(node, &drivers_list, &device_tree);
+        dev_node_t *dev_node = (dev_node_t *) arg;
+        assign_driver(dev_node, &drivers_list, &device_tree);
         return EOK;
 }
@@ -215 +215 @@
         
         fibril_rwlock_write_lock(&tree->rwlock);
-        node_t *parent = find_dev_node_no_lock(&device_tree, parent_handle);
-        
-        if (parent == NULL) {
+        dev_node_t *pdev = find_dev_node_no_lock(&device_tree, parent_handle);
+        
+        if (pdev == NULL) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 async_answer_0(callid, ENOENT);
@@ -223 +223 @@
         }
         
-        char *dev_name = NULL;
-        int rc = async_data_write_accept((void **)&dev_name, true, 0, 0, 0, 0);
+        char *fun_name = NULL;
+        int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -231 +231 @@
         }
         
-        node_t *node = create_dev_node();
-        if (!insert_dev_node(&device_tree, node, dev_name, parent)) {
+        fun_node_t *fun = create_fun_node();
+        if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
                 fibril_rwlock_write_unlock(&tree->rwlock);
-                delete_dev_node(node);
+                delete_fun_node(fun);
                 async_answer_0(callid, ENOMEM);
                 return;
         }
 
+        dev_node_t *dev;
+
+        dev = create_dev_node();
+        if (dev == NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                delete_fun_node(fun);
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+
+        insert_dev_node(tree, dev, fun);
+
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        printf(NAME ": devman_add_child %s\n", node->pathname);
-        
-        devman_receive_match_ids(match_count, &node->match_ids);
+        printf(NAME ": devman_add_child %s\n", fun->pathname);
+        
+        devman_receive_match_ids(match_count, &fun->match_ids);
 
         /*
@@ -252 +264 @@
          * task spawning which could take some time.
          */
-        fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
+        fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
         if (assign_fibril == 0) {
                 /*
@@ -258 +270 @@
                  * Probably not needed as we will die soon anyway ;-).
                  */
-                (void) assign_driver_fibril(node);
+                (void) assign_driver_fibril(fun);
         } else {
                 fibril_add_ready(assign_fibril);
@@ -264 +276 @@
 
         /* Return device handle to parent's driver. */
-        async_answer_1(callid, EOK, node->handle);
+        async_answer_1(callid, EOK, fun->handle);
 }
 
@@ -288 +300 @@
          * mapper.
          */
-        class_add_devmap_device(&class_list, cli);
+        class_add_devmap_function(&class_list, cli);
         
         free(devmap_pathname);
 }
 
-static void devman_add_device_to_class(ipc_callid_t callid, ipc_call_t *call)
+static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call)
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
@@ -306 +318 @@
         }       
         
-        node_t *dev = find_dev_node(&device_tree, handle);
-        if (dev == NULL) {
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
                 async_answer_0(callid, ENOENT);
                 return;
@@ -313 +325 @@
         
         dev_class_t *cl = get_dev_class(&class_list, class_name);
-        dev_class_info_t *class_info = add_device_to_class(dev, cl, NULL);
+        dev_class_info_t *class_info = add_function_to_class(fun, cl, NULL);
         
         /* Register the device's class alias by devmapper. */
         devmap_register_class_dev(class_info);
         
-        printf(NAME ": device '%s' added to class '%s', class name '%s' was "
-            "asigned to it\n", dev->pathname, class_name, class_info->dev_name);
+        printf(NAME ": function'%s' added to class '%s', class name '%s' was "
+            "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
 
         async_answer_0(callid, EOK);
@@ -376 +388 @@
                         break;
                 case DEVMAN_ADD_DEVICE_TO_CLASS:
-                        devman_add_device_to_class(callid, &call);
+                        devman_add_function_to_class(callid, &call);
                         break;
                 default:
@@ -387 +399 @@
 /** Find handle for the device instance identified by the device's path in the
  * device tree. */
-static void devman_device_get_handle(ipc_callid_t iid, ipc_call_t *icall)
+static void devman_function_get_handle(ipc_callid_t iid, ipc_call_t *icall)
 {
         char *pathname;
@@ -397 +409 @@
         }
         
-        node_t * dev = find_dev_node_by_path(&device_tree, pathname);
+        fun_node_t * fun = find_fun_node_by_path(&device_tree, pathname);
         
         free(pathname);
 
-        if (dev == NULL) {
+        if (fun == NULL) {
                 async_answer_0(iid, ENOENT);
                 return;
         }
         
-        async_answer_1(iid, EOK, dev->handle);
+        async_answer_1(iid, EOK, fun->handle);
 }
 
@@ -426 +438 @@
                         continue;
                 case DEVMAN_DEVICE_GET_HANDLE:
-                        devman_device_get_handle(callid, &call);
+                        devman_function_get_handle(callid, &call);
                         break;
                 default:
@@ -439 +451 @@
         devman_handle_t handle = IPC_GET_ARG2(*icall);
         
-        node_t *dev = find_dev_node(&device_tree, handle);
-        if (dev == NULL) {
-                printf(NAME ": devman_forward error - no device with handle %" PRIun
-                    " was found.\n", handle);
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                printf(NAME ": devman_forward error - no device function with "
+                    "handle %" PRIun " was found.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -450 +462 @@
         
         if (drv_to_parent) {
-                if (dev->parent != NULL)
-                        driver = dev->parent->drv;
-        } else if (dev->state == DEVICE_USABLE) {
-                driver = dev->drv;
+                if (fun->dev->pfun != NULL)
+                        driver = fun->dev->pfun->dev->drv;
+        } else if (fun->dev->state == DEVICE_USABLE) {
+                driver = fun->dev->drv;
                 assert(driver != NULL);
         }
@@ -478 +490 @@
         }
 
-        printf(NAME ": devman_forward: forward connection to device %s to "
-            "driver %s.\n", dev->pathname, driver->name);
-        async_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);
+        printf(NAME ": devman_forward: forward connection to function %s to "
+            "driver %s.\n", fun->pathname, driver->name);
+        async_forward_fast(iid, driver->phone, method, fun->handle, 0, IPC_FF_NONE);
 }
 
@@ -488 +500 @@
 {
         devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
-        node_t *dev;
-
-        dev = find_devmap_tree_device(&device_tree, devmap_handle);
-        if (dev == NULL)
-                dev = find_devmap_class_device(&class_list, devmap_handle);
-        
-        if (dev == NULL || dev->drv == NULL) {
+        fun_node_t *fun;
+        dev_node_t *dev;
+
+        fun = find_devmap_tree_function(&device_tree, devmap_handle);
+        if (fun == NULL)
+                fun = find_devmap_class_function(&class_list, devmap_handle);
+        
+        if (fun == NULL || fun->dev->drv == NULL) {
                 async_answer_0(iid, ENOENT);
                 return;
         }
+        
+        dev = fun->dev;
         
         if (dev->state != DEVICE_USABLE || dev->drv->phone <= 0) {
@@ -507 +522 @@
             IPC_FF_NONE);
         printf(NAME ": devman_connection_devmapper: forwarded connection to "
-            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
+            "device %s to driver %s.\n", fun->pathname, dev->drv->name);
 }
 

uspace/srv/devman/match.c

@@ -57 +57 @@
 }
 
-int get_match_score(driver_t *drv, node_t *dev)
+int get_match_score(driver_t *drv, dev_node_t *dev)
 {
         link_t *drv_head = &drv->match_ids.ids;
-        link_t *dev_head = &dev->match_ids.ids;
+        link_t *dev_head = &dev->pfun->match_ids.ids;
         
         if (list_empty(drv_head) || list_empty(dev_head))