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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (45 diffs)

uspace/srv/devman/devman.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <io/log.h>
 #include <ipc/driver.h>
 #include <ipc/devman.h>
 #include <devmap.h>
+#include <str_error.h>
+#include <stdio.h>
 
 #include "devman.h"
+
+fun_node_t *find_node_child(fun_node_t *parent, const char *name);
 
 /* hash table operations */
@@ -50 +55 @@
     link_t *item)
 {
-        node_t *dev = hash_table_get_instance(item, node_t, devman_link);
-        return (dev->handle == (device_handle_t) key[0]);
-}
-
-static int devmap_devices_compare(unsigned long key[], hash_count_t keys,
+        dev_node_t *dev = hash_table_get_instance(item, dev_node_t, devman_dev);
+        return (dev->handle == (devman_handle_t) key[0]);
+}
+
+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 == (dev_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]);
+}
+
+static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        dev_class_info_t *class_info
+            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
+        assert(class_info != NULL);
+
+        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -71 +93 @@
 };
 
+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
+};
+
+static hash_table_operations_t devmap_devices_class_ops = {
+        .hash = devices_hash,
+        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -114 +148 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        printf(NAME": the '%s' driver was added to the list of available "
-            "drivers.\n", drv->name);
+        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
+            "drivers.", drv->name);
 }
 
@@ -205 +239 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
+        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
         
         bool suc = false;
@@ -215 +249 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                printf(NAME ": unable to open %s\n", conf_path);
+                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                    conf_path, str_error(fd));
                 goto cleanup;
         }
@@ -223 +258 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
+                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
                 goto cleanup;
         }
@@ -229 +265 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": memory allocation failed when parsing file "
-                    "'%s'.\n", conf_path);
+                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
+                    "'%s'.", conf_path);
                 goto cleanup;
         }
         
-        if (read(fd, buf, len) <= 0) {
-                printf(NAME ": unable to read file '%s'.\n", conf_path);
+        ssize_t read_bytes = safe_read(fd, buf, len);
+        if (read_bytes <= 0) {
+                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
-        buf[len] = 0;
+        buf[read_bytes] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -273 +310 @@
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
 {
-        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
+        log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
             base_path, name);
         
@@ -305 +342 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                printf(NAME ": driver not found at path %s.", drv->binary_path);
+                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
+                    drv->binary_path);
                 goto cleanup;
         }
@@ -332 +370 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
+        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
         
         int drv_cnt = 0;
@@ -356 +394 @@
 }
 
-/** 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");
-
-        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;
-        }
-
-        return node != NULL;
+bool create_root_nodes(dev_tree_t *tree)
+{
+        fun_node_t *fun;
+        dev_node_t *dev;
+        
+        log_msg(LVL_DEBUG, "create_root_nodes()");
+        
+        fibril_rwlock_write_lock(&tree->rwlock);
+        
+        /*
+         * 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 dev != NULL;
 }
 
@@ -395 +459 @@
  *                      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;
@@ -423 +487 @@
  * @param drv           The driver.
  */
-void attach_driver(node_t *node, driver_t *drv)
-{
-        printf(NAME ": attach_driver %s to device %s\n",
-            drv->name, node->pathname);
+void attach_driver(dev_node_t *dev, driver_t *drv)
+{
+        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
+            dev->pfun->pathname, drv->name);
         
         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);
@@ -437 +501 @@
 
 /** Start a driver
- *
- * The driver's mutex is assumed to be locked.
  *
  * @param drv           The driver's structure.
@@ -446 +508 @@
 bool start_driver(driver_t *drv)
 {
-        printf(NAME ": start_driver '%s'\n", drv->name);
-        
-        const char *argv[2];
-        
-        argv[0] = drv->name;
-        argv[1] = NULL;
-        
-        int err;
-        if (task_spawn(drv->binary_path, argv, &err) == 0) {
-                printf(NAME ": error spawning %s, errno = %d\n",
-                    drv->name, err);
+        int rc;
+
+        assert(fibril_mutex_is_locked(&drv->driver_mutex));
+        
+        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
+        
+        rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
+                    drv->name, drv->binary_path, str_error(rc));
                 return false;
         }
@@ -495 +556 @@
 }
 
-/** Remember the driver's phone.
- *
- * @param driver        The driver.
- * @param phone         The phone to the driver.
- */
-void set_driver_phone(driver_t *driver, ipcarg_t phone)
-{
-        fibril_mutex_lock(&driver->driver_mutex);
-        assert(driver->state == DRIVER_STARTING);
-        driver->phone = phone;
-        fibril_mutex_unlock(&driver->driver_mutex);
-}
-
 /** Notify driver about the devices to which it was assigned.
  *
- * The driver's mutex must be locked.
- *
  * @param driver        The driver to which the devices are passed.
  */
 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;
 
-        printf(NAME ": pass_devices_to_driver\n");
-
-        phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-        if (phone > 0) {
-                
+        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
+            driver->name);
+
+        fibril_mutex_lock(&driver->driver_mutex);
+
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+
+        if (phone < 0) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return;
+        }
+
+        /*
+         * Go through devices list as long as there is some device
+         * that has not been passed to the driver.
+         */
+        link = driver->devices.next;
+        while (link != &driver->devices) {
+                dev = list_get_instance(link, dev_node_t, driver_devices);
+                if (dev->passed_to_driver) {
+                        link = link->next;
+                        continue;
+                }
+
+                /*
+                 * We remove the device from the list to allow safe adding
+                 * of new devices (no one will touch our item this way).
+                 */
+                list_remove(link);
+
+                /*
+                 * Unlock to avoid deadlock when adding device
+                 * handled by itself.
+                 */
+                fibril_mutex_unlock(&driver->driver_mutex);
+
+                add_device(phone, driver, dev, tree);
+
+                /*
+                 * Lock again as we will work with driver's
+                 * structure.
+                 */
+                fibril_mutex_lock(&driver->driver_mutex);
+
+                /*
+                 * Insert the device back.
+                 * The order is not relevant here so no harm is done
+                 * (actually, the order would be preserved in most cases).
+                 */
+                list_append(link, &driver->devices);
+
+                /*
+                 * Restart the cycle to go through all devices again.
+                 */
                 link = driver->devices.next;
-                while (link != &driver->devices) {
-                        dev = list_get_instance(link, node_t, driver_devices);
-                        add_device(phone, driver, dev, tree);
-                        link = link->next;
-                }
-                
-                ipc_hangup(phone);
-        }
+        }
+
+        async_hangup(phone);
+
+        /*
+         * Once we passed all devices to the driver, we need to mark the
+         * driver as running.
+         * It is vital to do it here and inside critical section.
+         *
+         * If we would change the state earlier, other devices added to
+         * the driver would be added to the device list and started
+         * immediately and possibly started here as well.
+         */
+        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
+        driver->state = DRIVER_RUNNING;
+
+        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -547 +651 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver\n");
-        fibril_mutex_lock(&driver->driver_mutex);
+        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
+            driver->name);
         
         /*
@@ -555 +659 @@
          */
         pass_devices_to_driver(driver, tree);
-        
-        /* Change driver's state to running. */
-        driver->state = DRIVER_RUNNING;
-        
-        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -574 +673 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
+        drv->phone = -1;
 }
 
@@ -604 +704 @@
 }
 
-/** 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. */
+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;
@@ -623 +723 @@
         }
         
-        devmap_device_register(devmap_pathname, &node->devmap_handle);
-        
-        tree_add_devmap_device(tree, node);
+        devmap_device_register_with_iface(devmap_pathname,
+            &fun->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        
+        tree_add_devmap_function(tree, fun);
         
         free(devmap_name);
@@ -631 +732 @@
 }
 
-
 /** Pass a device to running driver.
  *
@@ -637 +737 @@
  * @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)
-{
-        printf(NAME ": add_device\n");
-        
-        ipcarg_t rc;
+void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
+{
+        /*
+         * We do not expect to have driver's mutex locked as we do not
+         * access any structures that would affect driver_t.
+         */
+        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
+            drv->name, dev->pfun->name);
+        
+        sysarg_t rc;
         ipc_call_t answer;
         
         /* Send the device to the driver. */
-        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
-            &answer);
+        devman_handle_t parent_handle;
+        if (dev->pfun) {
+                parent_handle = dev->pfun->handle;
+        } else {
+                parent_handle = 0;
+        }
+
+        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 */
         }
-        
+
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
+
         switch(rc) {
         case EOK:
-                node->state = DEVICE_USABLE;
-                devmap_register_tree_device(node, tree);
+                dev->state = DEVICE_USABLE;
                 break;
         case ENOENT:
-                node->state = DEVICE_NOT_PRESENT;
+                dev->state = DEVICE_NOT_PRESENT;
                 break;
         default:
-                node->state = DEVICE_INVALID;
-        }
-        
+                dev->state = DEVICE_INVALID;
+        }
+        
+        dev->passed_to_driver = true;
+
         return;
 }
@@ -679 +793 @@
  *                      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);
+                log_msg(LVL_ERROR, "No driver found for device `%s'.",
+                    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);
         if (drv->state == DRIVER_NOT_STARTED) {
                 /* Start the driver. */
                 start_driver(drv);
         }
-        
-        if (drv->state == DRIVER_RUNNING) {
+        bool is_running = drv->state == DRIVER_RUNNING;
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
-                if (phone > 0) {
-                        add_device(phone, drv, node, tree);
-                        ipc_hangup(phone);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone >= 0) {
+                        add_device(phone, drv, dev, tree);
+                        async_hangup(phone);
                 }
         }
@@ -721 +843 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        printf(NAME ": init_device_tree.\n");
+        log_msg(LVL_DEBUG, "init_device_tree()");
         
         tree->current_handle = 0;
@@ -727 +849 @@
         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);
 }
 
@@ -746 +870 @@
  * @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);
         }
         
@@ -764 +888 @@
  * @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);
 }
 
 /** Find the device node structure of the device witch has the specified handle.
- *
- * Device tree's rwlock should be held at least for reading.
  *
  * @param tree          The device tree where we look for the device node.
@@ -784 +903 @@
  * @return              The device node.
  */
-node_t *find_dev_node_no_lock(dev_tree_t *tree, device_handle_t handle)
+dev_node_t *find_dev_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
 {
         unsigned long key = handle;
-        link_t *link = hash_table_find(&tree->devman_devices, &key);
-        return hash_table_get_instance(link, node_t, devman_link);
+        link_t *link;
+        
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
+        
+        link = hash_table_find(&tree->devman_devices, &key);
+        return hash_table_get_instance(link, dev_node_t, devman_dev);
 }
 
@@ -797 +920 @@
  * @return              The device node.
  */
-node_t *find_dev_node(dev_tree_t *tree, device_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.
@@ -816 +1012 @@
  *                      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) {
-                printf(NAME ": failed to allocate device path.\n");
+        fun->pathname = (char *) malloc(pathsize);
+        if (fun->pathname == NULL) {
+                log_msg(LVL_ERROR, "Failed to allocate device path.");
                 return false;
         }
         
         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);
         }
         
@@ -842 +1038 @@
 
 /** Insert new device into device tree.
- *
- * The device tree's rwlock should be already held exclusively when calling this
- * function.
  *
  * @param tree          The device tree.
@@ -854 +1047 @@
  *                      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);
-        
-        node->name = dev_name;
-        if (!set_dev_path(node, parent)) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
+            dev, pfun, pfun->pathname);
+
+        /* 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. */
+        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)
+{
+        assert(path != NULL);
+
+        bool is_absolute = path[0] == '/';
+        if (!is_absolute) {
+                return NULL;
+        }
+
         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)
          */
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[0] == '/');
-        
-        while (cont && dev != NULL) {
+        bool cont = true;
+        
+        while (cont && fun != NULL) {
                 next_path_elem  = get_path_elem_end(rel_path + 1);
                 if (next_path_elem[0] == '/') {
@@ -909 +1148 @@
                 }
                 
-                dev = find_node_child(dev, rel_path + 1);
+                fun = find_node_child(fun, rel_path + 1);
                 
                 if (cont) {
@@ -920 +1159 @@
         fibril_rwlock_read_unlock(&tree->rwlock);
         
-        return dev;
-}
-
-/** Find child device node with a specified name.
+        return fun;
+}
+
+/** Find function with a specified name belonging to given device.
  *
  * 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 dev Device the function belongs to.
+ * @param name Function name (not path).
+ * @return Function node.
+ * @retval NULL No function with given name.
+ */
+fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name)
+{
+        assert(dev != NULL);
+        assert(name != NULL);
+
+        fun_node_t *fun;
         link_t *link;
-        
-        link = parent->children.next;
-        
-        while (link != &parent->children) {
-                dev = list_get_instance(link, node_t, sibling);
-                
-                if (str_cmp(name, dev->name) == 0)
-                        return dev;
-                
-                link = link->next;
-        }
-        
+
+        for (link = dev->functions.next;
+            link != &dev->functions;
+            link = link->next) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+        }
+
         return NULL;
+}
+
+/** Find function node by its class name and index. */
+fun_node_t *find_fun_node_by_class(class_list_t *class_list,
+    const char *class_name, const char *dev_name)
+{
+        assert(class_list != NULL);
+        assert(class_name != NULL);
+        assert(dev_name != NULL);
+
+        fibril_rwlock_read_lock(&class_list->rwlock);
+
+        dev_class_t *cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        dev_class_info_t *dev = find_dev_in_class(cl, dev_name);
+        if (dev == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        fun_node_t *fun = dev->fun;
+
+        fibril_rwlock_read_unlock(&class_list->rwlock);
+
+        return fun;
+}
+
+
+/** Find child function node with a specified name.
+ *
+ * Device tree rwlock should be held at least for reading.
+ *
+ * @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)
+{
+        return find_fun_node_in_device(pfun->child, name);
 }
 
@@ -979 +1263 @@
         
         info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
-        if (info != NULL)
+        if (info != NULL) {
                 memset(info, 0, sizeof(dev_class_info_t));
+                link_initialize(&info->dev_classes);
+                link_initialize(&info->devmap_link);
+                link_initialize(&info->link);
+        }
         
         return info;
@@ -1016 +1304 @@
         
         size_t idx = get_new_class_dev_idx(cl);
-        asprintf(&dev_name, "%s%d", base_name, idx);
+        asprintf(&dev_name, "%s%zu", base_name, idx);
         
         return dev_name;
 }
 
-/** 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
@@ -1034 +1322 @@
  *                      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. */
@@ -1049 +1343 @@
                 
                 /* 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. */
@@ -1085 +1379 @@
         while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
-                if (str_cmp(cl->name, class_name) == 0)
+                if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
+                }
+                link = link->next;
         }
         
@@ -1095 +1391 @@
 {
         list_append(&cl->link, &class_list->classes);
+}
+
+dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name)
+{
+        assert(dev_class != NULL);
+        assert(dev_name != NULL);
+
+        link_t *link;
+        for (link = dev_class->devices.next;
+            link != &dev_class->devices;
+            link = link->next) {
+                dev_class_info_t *dev = list_get_instance(link,
+                    dev_class_info_t, link);
+
+                if (str_cmp(dev->dev_name, dev_name) == 0) {
+                        return dev;
+                }
+        }
+
+        return NULL;
 }
 
@@ -1101 +1417 @@
         list_initialize(&class_list->classes);
         fibril_rwlock_initialize(&class_list->rwlock);
-        hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
-            &devmap_devices_ops);
+        hash_table_create(&class_list->devmap_functions, DEVICE_BUCKETS, 1,
+            &devmap_devices_class_ops);
 }
 
@@ -1108 +1424 @@
 /* Devmap devices */
 
-node_t *find_devmap_tree_device(dev_tree_t *tree, dev_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,
-    dev_handle_t devmap_handle)
-{
-        node_t *dev = NULL;
+        return fun;
+}
+
+fun_node_t *find_devmap_class_function(class_list_t *classes,
+    devmap_handle_t devmap_handle)
+{
+        fun_node_t *fun = NULL;
         dev_class_info_t *cli;
         link_t *link;
@@ -1132 +1448 @@
         
         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);
-}
-
-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);
 }