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

File:

• uspace/srv/devman/devman.c (modified) (46 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 <loc.h>
+#include <devmap.h>
 #include <str_error.h>
-#include <stdio.h>
 
 #include "devman.h"
@@ -66 +64 @@
 }
 
-static int loc_functions_compare(unsigned long key[], hash_count_t keys,
+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, loc_fun);
-        return (fun->service_id == (service_id_t) key[0]);
+        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]);
 }
 
@@ -89 +97 @@
 };
 
-static hash_table_operations_t loc_devices_ops = {
+static hash_table_operations_t devmap_devices_ops = {
         .hash = devices_hash,
-        .compare = loc_functions_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
 };
@@ -132 +146 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
-            "drivers.", drv->name);
+        printf(NAME": the '%s' driver was added to the list of available "
+            "drivers.\n", drv->name);
 }
 
@@ -223 +237 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
+        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
         
         bool suc = false;
@@ -233 +247 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
-                    conf_path, str_error(fd));
+                printf(NAME ": unable to open %s\n", conf_path);
                 goto cleanup;
         }
@@ -242 +255 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
-                    conf_path);
+                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
                 goto cleanup;
         }
@@ -249 +261 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
-                    "'%s'.", conf_path);
+                printf(NAME ": memory allocation failed when parsing file "
+                    "'%s'.\n", conf_path);
                 goto cleanup;
         }
         
-        ssize_t read_bytes = read_all(fd, buf, len);
-        if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
-                    read_bytes);
+        if (read(fd, buf, len) <= 0) {
+                printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
-        buf[read_bytes] = 0;
+        buf[len] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -295 +305 @@
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
 {
-        log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
+        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
             base_path, name);
         
@@ -327 +337 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
-                    drv->binary_path);
+                printf(NAME ": driver not found at path %s.", drv->binary_path);
                 goto cleanup;
         }
@@ -355 +364 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
+        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
         
         int drv_cnt = 0;
@@ -389 +398 @@
         dev_node_t *dev;
         
-        log_msg(LVL_DEBUG, "create_root_nodes()");
+        printf(NAME ": create_root_nodes\n");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -406 +415 @@
         }
         
-        insert_fun_node(tree, fun, str_dup(""), NULL);
+        insert_fun_node(tree, fun, clone_string(""), NULL);
         match_id_t *id = create_match_id();
-        id->id = str_dup("root");
+        id->id = clone_string("root");
         id->score = 100;
         add_match_id(&fun->match_ids, id);
@@ -451 +460 @@
         fibril_mutex_lock(&drivers_list->drivers_mutex);
         
-        list_foreach(drivers_list->drivers, link) {
+        link_t *link = drivers_list->drivers.next;
+        while (link != &drivers_list->drivers) {
                 drv = list_get_instance(link, driver_t, drivers);
                 score = get_match_score(drv, node);
@@ -458 +468 @@
                         best_drv = drv;
                 }
+                link = link->next;
         }
         
@@ -472 +483 @@
 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);
+        printf(NAME ": attach_driver %s to device %s\n",
+            drv->name, dev->pfun->pathname);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -495 +506 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
+        printf(NAME ": start_driver '%s'\n", 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));
+                printf(NAME ": error spawning %s (%s)\n",
+                    drv->name, str_error(rc));
                 return false;
         }
@@ -519 +530 @@
         driver_t *res = NULL;
         driver_t *drv = NULL;
+        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        list_foreach(drv_list->drivers, link) {
+        link = drv_list->drivers.next;
+        while (link != &drv_list->drivers) {
                 drv = list_get_instance(link, driver_t, drivers);
                 if (str_cmp(drv->name, drv_name) == 0) {
@@ -528 +541 @@
                         break;
                 }
+
+                link = link->next;
         }
         
@@ -533 +548 @@
         
         return res;
+}
+
+/** Remember the driver's phone.
+ *
+ * @param driver        The driver.
+ * @param phone         The phone to the driver.
+ */
+void set_driver_phone(driver_t *driver, sysarg_t phone)
+{
+        fibril_mutex_lock(&driver->driver_mutex);
+        assert(driver->state == DRIVER_STARTING);
+        driver->phone = phone;
+        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -543 +571 @@
         dev_node_t *dev;
         link_t *link;
-
-        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
-            driver->name);
+        int phone;
+
+        printf(NAME ": pass_devices_to_driver(`%s')\n", 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;
+        }
 
         /*
@@ -553 +588 @@
          * that has not been passed to the driver.
          */
-        link = driver->devices.head.next;
-        while (link != &driver->devices.head) {
+        link = driver->devices.next;
+        while (link != &driver->devices) {
                 dev = list_get_instance(link, dev_node_t, driver_devices);
                 if (dev->passed_to_driver) {
@@ -573 +608 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(driver, dev, tree);
+                add_device(phone, driver, dev, tree);
 
                 /*
@@ -591 +626 @@
                  * Restart the cycle to go through all devices again.
                  */
-                link = driver->devices.head.next;
-        }
+                link = driver->devices.next;
+        }
+
+        async_hangup(phone);
 
         /*
@@ -603 +640 @@
          * immediately and possibly started here as well.
          */
-        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -620 +657 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
-            driver->name);
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*
@@ -642 +678 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->sess = NULL;
 }
 
@@ -673 +708 @@
 }
 
-/** Create loc path and name for the function. */
-void loc_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
-{
-        char *loc_pathname = NULL;
-        char *loc_name = NULL;
-        
-        asprintf(&loc_name, "%s", fun->pathname);
-        if (loc_name == NULL)
+/** 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", fun->pathname);
+        if (devmap_name == NULL)
                 return;
         
-        replace_char(loc_name, '/', LOC_SEPARATOR);
-        
-        asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE,
-            loc_name);
-        if (loc_pathname == NULL) {
-                free(loc_name);
+        replace_char(devmap_name, '/', DEVMAP_SEPARATOR);
+        
+        asprintf(&devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,
+            devmap_name);
+        if (devmap_pathname == NULL) {
+                free(devmap_name);
                 return;
         }
         
-        loc_service_register_with_iface(loc_pathname,
-            &fun->service_id, DEVMAN_CONNECT_FROM_LOC);
-        
-        tree_add_loc_function(tree, fun);
-        
-        free(loc_name);
-        free(loc_pathname);
+        devmap_device_register_with_iface(devmap_pathname,
+            &fun->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        
+        tree_add_devmap_function(tree, fun);
+        
+        free(devmap_name);
+        free(devmap_pathname);
 }
 
@@ -706 +741 @@
  * @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(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -712 +747 @@
          * access any structures that would affect driver_t.
          */
-        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
-            drv->name, dev->pfun->name);
+        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
+            dev->pfun->name);
+        
+        sysarg_t rc;
+        ipc_call_t answer;
         
         /* Send the device to the driver. */
@@ -722 +760 @@
                 parent_handle = 0;
         }
-        
-        async_exch_t *exch = async_exchange_begin(drv->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 */
@@ -777 +809 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                log_msg(LVL_ERROR, "No driver found for device `%s'.",
+                printf(NAME ": no driver found for device '%s'.\n",
                     dev->pfun->pathname);
                 return false;
@@ -793 +825 @@
         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. */
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone >= 0) {
+                        add_device(phone, drv, dev, tree);
+                        async_hangup(phone);
+                }
+        }
         
         return true;
@@ -810 +847 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        log_msg(LVL_DEBUG, "init_device_tree()");
+        printf(NAME ": init_device_tree.\n");
         
         tree->current_handle = 0;
@@ -818 +855 @@
         hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1,
             &devman_functions_ops);
-        hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1,
-            &loc_devices_ops);
+        hash_table_create(&tree->devmap_functions, DEVICE_BUCKETS, 1,
+            &devmap_devices_ops);
         
         fibril_rwlock_initialize(&tree->rwlock);
@@ -898 +935 @@
 }
 
-/** 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 */
 
@@ -943 +949 @@
                 link_initialize(&res->dev_functions);
                 list_initialize(&res->match_ids.ids);
+                list_initialize(&res->classes);
                 link_initialize(&res->devman_fun);
-                link_initialize(&res->loc_fun);
+                link_initialize(&res->devmap_fun);
         }
         
@@ -1019 +1026 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate device path.");
+                printf(NAME ": failed to allocate device path.\n");
                 return false;
         }
@@ -1050 +1057 @@
         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;
@@ -1059 +1063 @@
 
         /* 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;
@@ -1107 +1112 @@
         
         return true;
-}
-
-/** Remove function from device tree.
- *
- * @param tree          Device tree
- * @param node          Function node to remove
- */
-void remove_fun_node(dev_tree_t *tree, fun_node_t *fun)
-{
-        assert(tree != NULL);
-        assert(fun != NULL);
-        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-        
-        /* Remove the node from the handle-to-node map. */
-        unsigned long key = fun->handle;
-        hash_table_remove(&tree->devman_functions, &key, 1);
-        
-        /* Remove the node from the list of its parent's children. */
-        if (fun->dev != NULL)
-                list_remove(&fun->dev_functions);
 }
 
@@ -1138 +1123 @@
 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);
         
@@ -1154 +1132 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[1] != '\0');
+        bool cont = (rel_path[0] == '/');
         
         while (cont && fun != NULL) {
@@ -1179 +1157 @@
 }
 
-/** Find function with a specified name belonging to given device.
- *
- * Device tree rwlock should be held at least for reading.
- *
- * @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;
-
-        list_foreach(dev->functions, link) {
-                fun = list_get_instance(link, fun_node_t, dev_functions);
-
-                if (str_cmp(name, fun->name) == 0)
-                        return fun;
-        }
-
-        return NULL;
-}
-
 /** Find child function node with a specified name.
  *
@@ -1215 +1167 @@
 fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
 {
-        return find_fun_node_in_device(pfun->child, name);
-}
-
-/* loc devices */
-
-fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id)
+        fun_node_t *fun;
+        link_t *link;
+        
+        link = pfun->child->functions.next;
+        
+        while (link != &pfun->child->functions) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+                
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+                
+                link = link->next;
+        }
+        
+        return NULL;
+}
+
+/* Device classes */
+
+/** Create device class.
+ *
+ * @return      Device class.
+ */
+dev_class_t *create_dev_class(void)
+{
+        dev_class_t *cl;
+        
+        cl = (dev_class_t *) malloc(sizeof(dev_class_t));
+        if (cl != NULL) {
+                memset(cl, 0, sizeof(dev_class_t));
+                list_initialize(&cl->devices);
+                fibril_mutex_initialize(&cl->mutex);
+        }
+        
+        return cl;
+}
+
+/** Create device class info.
+ *
+ * @return              Device class info.
+ */
+dev_class_info_t *create_dev_class_info(void)
+{
+        dev_class_info_t *info;
+        
+        info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
+        if (info != NULL) {
+                memset(info, 0, sizeof(dev_class_info_t));
+                list_initialize(&info->dev_classes);
+                list_initialize(&info->devmap_link);
+                list_initialize(&info->link);
+        }
+        
+        return info;
+}
+
+size_t get_new_class_dev_idx(dev_class_t *cl)
+{
+        size_t dev_idx;
+        
+        fibril_mutex_lock(&cl->mutex);
+        dev_idx = ++cl->curr_dev_idx;
+        fibril_mutex_unlock(&cl->mutex);
+        
+        return dev_idx;
+}
+
+
+/** Create unique device name within the class.
+ *
+ * @param cl            The class.
+ * @param base_dev_name Contains the base name for the device if it was
+ *                      specified by the driver when it registered the device by
+ *                      the class; NULL if driver specified no base name.
+ * @return              The unique name for the device within the class.
+ */
+char *create_dev_name_for_class(dev_class_t *cl, const char *base_dev_name)
+{
+        char *dev_name;
+        const char *base_name;
+        
+        if (base_dev_name != NULL)
+                base_name = base_dev_name;
+        else
+                base_name = cl->base_dev_name;
+        
+        size_t idx = get_new_class_dev_idx(cl);
+        asprintf(&dev_name, "%s%zu", base_name, idx);
+        
+        return dev_name;
+}
+
+/** Add the device function to the class.
+ *
+ * The device may be added to multiple classes and a class may contain multiple
+ * devices. The class and the device are associated with each other by the
+ * dev_class_info_t structure.
+ *
+ * @param dev           The device.
+ * @param class         The class.
+ * @param base_dev_name The base name of the device within the class if
+ *                      specified by the driver, NULL otherwise.
+ * @return              dev_class_info_t structure which associates the device
+ *                      with the class.
+ */
+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;
+
+        assert(fun != NULL);
+        assert(cl != NULL);
+
+        info = create_dev_class_info();
+
+        
+        if (info != NULL) {
+                info->dev_class = cl;
+                info->fun = fun;
+                
+                /* Add the device to the class. */
+                fibril_mutex_lock(&cl->mutex);
+                list_append(&info->link, &cl->devices);
+                fibril_mutex_unlock(&cl->mutex);
+                
+                /* Add the class to the device. */
+                list_append(&info->dev_classes, &fun->classes);
+                
+                /* Create unique name for the device within the class. */
+                info->dev_name = create_dev_name_for_class(cl, base_dev_name);
+        }
+        
+        return info;
+}
+
+dev_class_t *get_dev_class(class_list_t *class_list, char *class_name)
+{
+        dev_class_t *cl;
+        
+        fibril_rwlock_write_lock(&class_list->rwlock);
+        cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                cl = create_dev_class();
+                if (cl != NULL) {
+                        cl->name = class_name;
+                        cl->base_dev_name = "";
+                        add_dev_class_no_lock(class_list, cl);
+                }
+        }
+
+        fibril_rwlock_write_unlock(&class_list->rwlock);
+        return cl;
+}
+
+dev_class_t *find_dev_class_no_lock(class_list_t *class_list,
+    const char *class_name)
+{
+        dev_class_t *cl;
+        link_t *link = class_list->classes.next;
+        
+        while (link != &class_list->classes) {
+                cl = list_get_instance(link, dev_class_t, link);
+                if (str_cmp(cl->name, class_name) == 0) {
+                        return cl;
+                }
+                link = link->next;
+        }
+        
+        return NULL;
+}
+
+void add_dev_class_no_lock(class_list_t *class_list, dev_class_t *cl)
+{
+        list_append(&cl->link, &class_list->classes);
+}
+
+void init_class_list(class_list_t *class_list)
+{
+        list_initialize(&class_list->classes);
+        fibril_rwlock_initialize(&class_list->rwlock);
+        hash_table_create(&class_list->devmap_functions, DEVICE_BUCKETS, 1,
+            &devmap_devices_class_ops);
+}
+
+
+/* Devmap devices */
+
+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) service_id;
+        unsigned long key = (unsigned long) devmap_handle;
         
         fibril_rwlock_read_lock(&tree->rwlock);
-        link = hash_table_find(&tree->loc_functions, &key);
+        link = hash_table_find(&tree->devmap_functions, &key);
         if (link != NULL)
-                fun = hash_table_get_instance(link, fun_node_t, loc_fun);
+                fun = hash_table_get_instance(link, fun_node_t, devmap_fun);
         fibril_rwlock_read_unlock(&tree->rwlock);
         
@@ -1235 +1369 @@
 }
 
-void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun)
-{
-        unsigned long key = (unsigned long) fun->service_id;
+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;
+        unsigned long key = (unsigned long)devmap_handle;
+        
+        fibril_rwlock_read_lock(&classes->rwlock);
+        link = hash_table_find(&classes->devmap_functions, &key);
+        if (link != NULL) {
+                cli = hash_table_get_instance(link, dev_class_info_t,
+                    devmap_link);
+                fun = cli->fun;
+        }
+        fibril_rwlock_read_unlock(&classes->rwlock);
+        
+        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_functions, &key, &cli->devmap_link);
+        fibril_rwlock_write_unlock(&class_list->rwlock);
+
+        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->loc_functions, &key, &fun->loc_fun);
+        hash_table_insert(&tree->devmap_functions, &key, &fun->devmap_fun);
         fibril_rwlock_write_unlock(&tree->rwlock);
 }