Changeset 8ff0bd2 in mainline for uspace/srv/devman

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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

Location:

uspace/srv/devman

Files:

• devman.c (modified) (49 diffs)
• devman.h (modified) (14 diffs)
• main.c (modified) (30 diffs)
• match.c (modified) (2 diffs)
• util.c (modified) (2 diffs)
• util.h (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -30 +30 @@
  * @{
  */
+/** @file Device Manager
+ *
+ * Locking order:
+ *   (1) driver_t.driver_mutex
+ *   (2) dev_tree_t.rwlock
+ *
+ * Synchronization:
+ *    - device_tree.rwlock protects:
+ *        - tree root, complete tree topology
+ *        - complete contents of device and function nodes
+ *    - dev_node_t.refcnt, fun_node_t.refcnt prevent nodes from
+ *      being deallocated
+ *    - find_xxx() functions increase reference count of returned object
+ *    - find_xxx_no_lock() do not increase reference count
+ *
+ * TODO
+ *    - Track all steady and transient device/function states
+ *    - Check states, wait for steady state on certain operations
+ */
 
 #include <errno.h>
@@ -37 +56 @@
 #include <ipc/driver.h>
 #include <ipc/devman.h>
-#include <devmap.h>
+#include <loc.h>
 #include <str_error.h>
 #include <stdio.h>
@@ -43 +62 @@
 #include "devman.h"
 
-fun_node_t *find_node_child(fun_node_t *parent, const char *name);
+static fun_node_t *find_node_child(dev_tree_t *, fun_node_t *, const char *);
 
 /* hash table operations */
@@ -66 +85 @@
 }
 
-static int devmap_functions_compare(unsigned long key[], hash_count_t keys,
+static int loc_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]);
+        fun_node_t *fun = hash_table_get_instance(item, fun_node_t, loc_fun);
+        return (fun->service_id == (service_id_t) key[0]);
 }
 
@@ -99 +108 @@
 };
 
-static hash_table_operations_t devmap_devices_ops = {
+static hash_table_operations_t loc_devices_ops = {
         .hash = devices_hash,
-        .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,
+        .compare = loc_functions_compare,
         .remove_callback = devices_remove_callback
 };
@@ -270 +273 @@
         }
         
-        ssize_t read_bytes = safe_read(fd, buf, len);
+        ssize_t read_bytes = read_all(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
+                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                    read_bytes);
                 goto cleanup;
         }
@@ -421 +425 @@
         }
         
-        insert_fun_node(tree, fun, clone_string(""), NULL);
+        fun_add_ref(fun);
+        insert_fun_node(tree, fun, str_dup(""), NULL);
+        
         match_id_t *id = create_match_id();
-        id->id = clone_string("root");
+        id->id = str_dup("root");
         id->score = 100;
         add_match_id(&fun->match_ids, id);
@@ -437 +443 @@
         }
         
+        dev_add_ref(dev);
         insert_dev_node(tree, dev, fun);
         
@@ -466 +473 @@
         fibril_mutex_lock(&drivers_list->drivers_mutex);
         
-        link_t *link = drivers_list->drivers.next;
-        while (link != &drivers_list->drivers) {
+        list_foreach(drivers_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 score = get_match_score(drv, node);
@@ -474 +480 @@
                         best_drv = drv;
                 }
-                link = link->next;
         }
         
@@ -484 +489 @@
 /** Assign a driver to a device.
  *
+ * @param tree          Device tree
  * @param node          The device's node in the device tree.
  * @param drv           The driver.
  */
-void attach_driver(dev_node_t *dev, driver_t *drv)
+void attach_driver(dev_tree_t *tree, dev_node_t *dev, driver_t *drv)
 {
         log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
@@ -493 +499 @@
         
         fibril_mutex_lock(&drv->driver_mutex);
+        fibril_rwlock_write_lock(&tree->rwlock);
         
         dev->drv = drv;
         list_append(&dev->driver_devices, &drv->devices);
         
+        fibril_rwlock_write_unlock(&tree->rwlock);
+        fibril_mutex_unlock(&drv->driver_mutex);
+}
+
+/** Detach driver from device.
+ *
+ * @param tree          Device tree
+ * @param node          The device's node in the device tree.
+ * @param drv           The driver.
+ */
+void detach_driver(dev_tree_t *tree, dev_node_t *dev)
+{
+        driver_t *drv = dev->drv;
+        
+        assert(drv != NULL);
+        
+        log_msg(LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
+            dev->pfun->pathname, drv->name);
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        fibril_rwlock_write_lock(&tree->rwlock);
+        
+        dev->drv = NULL;
+        list_remove(&dev->driver_devices);
+        
+        fibril_rwlock_write_unlock(&tree->rwlock);
         fibril_mutex_unlock(&drv->driver_mutex);
 }
@@ -536 +569 @@
         driver_t *res = NULL;
         driver_t *drv = NULL;
-        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        link = drv_list->drivers.next;
-        while (link != &drv_list->drivers) {
+        list_foreach(drv_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 if (str_cmp(drv->name, drv_name) == 0) {
@@ -547 +578 @@
                         break;
                 }
-
-                link = link->next;
         }
         
@@ -569 +598 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-        
-        async_exch_t *exch = async_exchange_begin(driver->sess);
-        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-            DRIVER_DEVMAN, 0, 0);
-        async_exchange_end(exch);
-
-        if (!sess) {
-                fibril_mutex_unlock(&driver->driver_mutex);
-                return;
-        }
 
         /*
@@ -584 +603 @@
          * that has not been passed to the driver.
          */
-        link = driver->devices.next;
-        while (link != &driver->devices) {
+        link = driver->devices.head.next;
+        while (link != &driver->devices.head) {
                 dev = list_get_instance(link, dev_node_t, driver_devices);
+                fibril_rwlock_write_lock(&tree->rwlock);
+                
                 if (dev->passed_to_driver) {
+                        fibril_rwlock_write_unlock(&tree->rwlock);
                         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);
+                log_msg(LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
+                    (int)atomic_get(&dev->refcnt));
+                dev_add_ref(dev);
 
                 /*
@@ -603 +623 @@
                  */
                 fibril_mutex_unlock(&driver->driver_mutex);
-
-                add_device(sess, driver, dev, tree);
+                fibril_rwlock_write_unlock(&tree->rwlock);
+
+                add_device(driver, dev, tree);
+
+                dev_del_ref(dev);
 
                 /*
@@ -613 +636 @@
 
                 /*
-                 * 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;
-        }
-
-        async_hangup(sess);
+                link = driver->devices.head.next;
+        }
 
         /*
@@ -706 +720 @@
 }
 
-/** 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)
+/** 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;
+        
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
+        
+        asprintf(&loc_name, "%s", fun->pathname);
+        if (loc_name == NULL)
                 return;
         
-        replace_char(devmap_name, '/', DEVMAP_SEPARATOR);
-        
-        asprintf(&devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,
-            devmap_name);
-        if (devmap_pathname == NULL) {
-                free(devmap_name);
+        replace_char(loc_name, '/', LOC_SEPARATOR);
+        
+        asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE,
+            loc_name);
+        if (loc_pathname == NULL) {
+                free(loc_name);
                 return;
         }
         
-        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);
+        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);
 }
 
@@ -739 +755 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
-    dev_tree_t *tree)
+void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
         /*
@@ -757 +772 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(sess);
+        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(exch, DRIVER_DEV_ADD, dev->handle,
             parent_handle, &answer);
         
@@ -817 +832 @@
         
         /* Attach the driver to the device. */
-        attach_driver(dev, drv);
+        attach_driver(tree, dev, drv);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -827 +842 @@
         fibril_mutex_unlock(&drv->driver_mutex);
 
-        if (is_running) {
-                /* Notify the driver about the new device. */
-                async_exch_t *exch = async_exchange_begin(drv->sess);
-                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
-                    DRIVER_DEVMAN, 0, 0);
-                async_exchange_end(exch);
-                
-                if (sess) {
-                        add_device(sess, drv, dev, tree);
-                        async_hangup(sess);
-                }
-        }
-        
+        /* Notify the driver about the new device. */
+        if (is_running)
+                add_device(drv, dev, tree);
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        fibril_rwlock_write_lock(&tree->rwlock);
+        if (dev->pfun != NULL) {
+                dev->pfun->state = FUN_ON_LINE;
+        }
+        fibril_rwlock_write_unlock(&tree->rwlock);
         return true;
+}
+
+int driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        devman_handle_t handle;
+        
+        assert(dev != NULL);
+        
+        log_msg(LVL_DEBUG, "driver_dev_remove(%p)", dev);
+        
+        fibril_rwlock_read_lock(&tree->rwlock);
+        drv = dev->drv;
+        handle = dev->handle;
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_DEV_REMOVE, handle);
+        async_exchange_end(exch);
+        
+        return retval;
+
+}
+
+int driver_fun_online(dev_tree_t *tree, fun_node_t *fun)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        devman_handle_t handle;
+        
+        log_msg(LVL_DEBUG, "driver_fun_online(%p)", fun);
+
+        fibril_rwlock_read_lock(&tree->rwlock);
+        
+        if (fun->dev == NULL) {
+                /* XXX root function? */
+                fibril_rwlock_read_unlock(&tree->rwlock);
+                return EINVAL;
+        }
+        
+        drv = fun->dev->drv;
+        handle = fun->handle;
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_FUN_ONLINE, handle);
+        loc_exchange_end(exch);
+        
+        return retval;
+}
+
+int driver_fun_offline(dev_tree_t *tree, fun_node_t *fun)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        driver_t *drv;
+        devman_handle_t handle;
+        
+        log_msg(LVL_DEBUG, "driver_fun_offline(%p)", fun);
+
+        fibril_rwlock_read_lock(&tree->rwlock);
+        if (fun->dev == NULL) {
+                /* XXX root function? */
+                fibril_rwlock_read_unlock(&tree->rwlock);
+                return EINVAL;
+        }
+        
+        drv = fun->dev->drv;
+        handle = fun->handle;
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        exch = async_exchange_begin(drv->sess);
+        retval = async_req_1_0(exch, DRIVER_FUN_OFFLINE, handle);
+        loc_exchange_end(exch);
+        
+        return retval;
+
 }
 
@@ -861 +955 @@
         hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1,
             &devman_functions_ops);
-        hash_table_create(&tree->devmap_functions, DEVICE_BUCKETS, 1,
-            &devmap_devices_ops);
+        hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1,
+            &loc_devices_ops);
         
         fibril_rwlock_initialize(&tree->rwlock);
@@ -869 +963 @@
         if (!create_root_nodes(tree))
                 return false;
-
+    
         /* Find suitable driver and start it. */
-        return assign_driver(tree->root_node->child, drivers_list, tree);
+        dev_node_t *rdev = tree->root_node->child;
+        dev_add_ref(rdev);
+        int rc = assign_driver(rdev, drivers_list, tree);
+        dev_del_ref(rdev);
+        
+        return rc;
 }
 
@@ -882 +981 @@
 dev_node_t *create_dev_node(void)
 {
-        dev_node_t *res = malloc(sizeof(dev_node_t));
-        
-        if (res != NULL) {
-                memset(res, 0, sizeof(dev_node_t));
-                list_initialize(&res->functions);
-                link_initialize(&res->driver_devices);
-                link_initialize(&res->devman_dev);
-        }
-        
-        return res;
+        dev_node_t *dev;
+        
+        dev = calloc(1, sizeof(dev_node_t));
+        if (dev == NULL)
+                return NULL;
+        
+        atomic_set(&dev->refcnt, 0);
+        list_initialize(&dev->functions);
+        link_initialize(&dev->driver_devices);
+        link_initialize(&dev->devman_dev);
+        
+        return dev;
 }
 
@@ -907 +1008 @@
 }
 
+/** Increase device node reference count.
+ *
+ * @param dev   Device node
+ */
+void dev_add_ref(dev_node_t *dev)
+{
+        atomic_inc(&dev->refcnt);
+}
+
+/** Decrease device node reference count.
+ *
+ * When the count drops to zero the device node is freed.
+ *
+ * @param dev   Device node
+ */
+void dev_del_ref(dev_node_t *dev)
+{
+        if (atomic_predec(&dev->refcnt) == 0)
+                delete_dev_node(dev);
+}
+
+
 /** Find the device node structure of the device witch has the specified handle.
  *
@@ -936 +1059 @@
         fibril_rwlock_read_lock(&tree->rwlock);
         dev = find_dev_node_no_lock(tree, handle);
+        if (dev != NULL)
+                dev_add_ref(dev);
+        
         fibril_rwlock_read_unlock(&tree->rwlock);
         
@@ -941 +1067 @@
 }
 
+/** 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 */
 
@@ -949 +1108 @@
 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;
+        fun_node_t *fun;
+
+        fun = calloc(1, sizeof(fun_node_t));
+        if (fun == NULL)
+                return NULL;
+        
+        fun->state = FUN_INIT;
+        atomic_set(&fun->refcnt, 0);
+        link_initialize(&fun->dev_functions);
+        list_initialize(&fun->match_ids.ids);
+        link_initialize(&fun->devman_fun);
+        link_initialize(&fun->loc_fun);
+        
+        return fun;
 }
 
@@ -978 +1139 @@
 }
 
+/** Increase function node reference count.
+ *
+ * @param fun   Function node
+ */
+void fun_add_ref(fun_node_t *fun)
+{
+        atomic_inc(&fun->refcnt);
+}
+
+/** Decrease function node reference count.
+ *
+ * When the count drops to zero the function node is freed.
+ *
+ * @param fun   Function node
+ */
+void fun_del_ref(fun_node_t *fun)
+{
+        if (atomic_predec(&fun->refcnt) == 0)
+                delete_fun_node(fun);
+}
+
 /** Find the function node with the specified handle.
  *
@@ -988 +1170 @@
         unsigned long key = handle;
         link_t *link;
+        fun_node_t *fun;
         
         assert(fibril_rwlock_is_locked(&tree->rwlock));
@@ -995 +1178 @@
                 return NULL;
         
-        return hash_table_get_instance(link, fun_node_t, devman_fun);
+        fun = hash_table_get_instance(link, fun_node_t, devman_fun);
+        
+        return fun;
 }
 
@@ -1009 +1194 @@
         
         fibril_rwlock_read_lock(&tree->rwlock);
+        
         fun = find_fun_node_no_lock(tree, handle);
+        if (fun != NULL)
+                fun_add_ref(fun);
+        
         fibril_rwlock_read_unlock(&tree->rwlock);
         
@@ -1017 +1206 @@
 /** Create and set device's full path in device tree.
  *
+ * @param tree          Device tree
  * @param node          The device's device node.
  * @param parent        The parent device node.
@@ -1022 +1212 @@
  *                      resources etc.).
  */
-static bool set_fun_path(fun_node_t *fun, fun_node_t *parent)
-{
+static bool set_fun_path(dev_tree_t *tree, fun_node_t *fun, fun_node_t *parent)
+{
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         assert(fun->name != NULL);
         
@@ -1050 +1241 @@
  *
  * @param tree          The device tree.
- * @param node          The newly added device node. 
- * @param dev_name      The name of the newly added device.
- * @param parent        The parent device node.
+ * @param dev           The newly added device node.
+ * @param pfun          The parent function node.
  *
  * @return              True on success, false otherwise (insufficient resources
@@ -1059 +1249 @@
 bool insert_dev_node(dev_tree_t *tree, dev_node_t *dev, fun_node_t *pfun)
 {
-        assert(dev != NULL);
-        assert(tree != NULL);
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
@@ -1078 +1266 @@
 }
 
+/** Remove device from device tree.
+ *
+ * @param tree          Device tree
+ * @param dev           Device node
+ */
+void remove_dev_node(dev_tree_t *tree, dev_node_t *dev)
+{
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        log_msg(LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
+        
+        /* Remove node from the handle-to-node map. */
+        unsigned long key = dev->handle;
+        hash_table_remove(&tree->devman_devices, &key, 1);
+        
+        /* Unlink from parent function. */
+        dev->pfun->child = NULL;
+        dev->pfun = NULL;
+        
+        dev->state = DEVICE_REMOVED;
+}
+
+
 /** 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.
+ * @param fun           The newly added function node. 
+ * @param fun_name      The name of the newly added function.
+ * @param dev           Owning device node.
  *
  * @return              True on success, false otherwise (insufficient resources
@@ -1093 +1304 @@
         fun_node_t *pfun;
         
-        assert(fun != NULL);
-        assert(tree != NULL);
         assert(fun_name != NULL);
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
@@ -1105 +1314 @@
         
         fun->name = fun_name;
-        if (!set_fun_path(fun, pfun)) {
+        if (!set_fun_path(tree, fun, pfun)) {
                 return false;
         }
@@ -1120 +1329 @@
         
         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(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);
+        
+        fun->dev = NULL;
+        fun->state = FUN_REMOVED;
 }
 
@@ -1141 +1371 @@
         
         fun_node_t *fun = tree->root_node;
+        fun_add_ref(fun);
         /*
          * Relative path to the function from its parent (but with '/' at the
@@ -1147 +1378 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = true;
+        bool cont = (rel_path[1] != '\0');
         
         while (cont && fun != NULL) {
@@ -1158 +1389 @@
                 }
                 
-                fun = find_node_child(fun, rel_path + 1);
+                fun_node_t *cfun = find_node_child(tree, fun, rel_path + 1);
+                fun_del_ref(fun);
+                fun = cfun;
                 
                 if (cont) {
@@ -1176 +1409 @@
  * Device tree rwlock should be held at least for reading.
  *
+ * @param tree Device tree
  * @param dev Device the function belongs to.
  * @param name Function name (not path).
@@ -1181 +1415 @@
  * @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);
+fun_node_t *find_fun_node_in_device(dev_tree_t *tree, dev_node_t *dev,
+    const char *name)
+{
         assert(name != NULL);
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
 
         fun_node_t *fun;
-        link_t *link;
-
-        for (link = dev->functions.next;
-            link != &dev->functions;
-            link = link->next) {
+
+        list_foreach(dev->functions, link) {
                 fun = list_get_instance(link, fun_node_t, dev_functions);
 
-                if (str_cmp(name, fun->name) == 0)
+                if (str_cmp(name, fun->name) == 0) {
+                        fun_add_ref(fun);
                         return fun;
+                }
         }
 
@@ -1201 +1435 @@
 }
 
-/** 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 tree          Device tree
  * @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);
-}
-
-/* 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));
-                link_initialize(&info->dev_classes);
-                link_initialize(&info->devmap_link);
-                link_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);
-}
-
-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;
-}
-
-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)
+static fun_node_t *find_node_child(dev_tree_t *tree, fun_node_t *pfun,
+    const char *name)
+{
+        return find_fun_node_in_device(tree, 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 = NULL;
         link_t *link;
-        unsigned long key = (unsigned long) devmap_handle;
+        unsigned long key = (unsigned long) service_id;
         
         fibril_rwlock_read_lock(&tree->rwlock);
-        link = hash_table_find(&tree->devmap_functions, &key);
-        if (link != NULL)
-                fun = hash_table_get_instance(link, fun_node_t, devmap_fun);
+        link = hash_table_find(&tree->loc_functions, &key);
+        if (link != NULL) {
+                fun = hash_table_get_instance(link, fun_node_t, loc_fun);
+                fun_add_ref(fun);
+        }
         fibril_rwlock_read_unlock(&tree->rwlock);
         
@@ -1449 +1469 @@
 }
 
-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->devmap_functions, &key, &fun->devmap_fun);
-        fibril_rwlock_write_unlock(&tree->rwlock);
+void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun)
+{
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        unsigned long key = (unsigned long) fun->service_id;
+        hash_table_insert(&tree->loc_functions, &key, &fun->loc_fun);
 }
 

uspace/srv/devman/devman.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +42 @@
 #include <adt/hash_table.h>
 #include <ipc/devman.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <fibril_synch.h>
 #include <atomic.h>
@@ -53 +54 @@
 #define DEVICE_BUCKETS 256
 
-#define DEVMAP_CLASS_NAMESPACE "class"
-#define DEVMAP_DEVICE_NAMESPACE "devices"
-#define DEVMAP_SEPARATOR '\\'
+#define LOC_DEVICE_NAMESPACE "devices"
+#define LOC_SEPARATOR '\\'
 
 struct dev_node;
@@ -62 +62 @@
 struct fun_node;
 typedef struct fun_node fun_node_t;
+
+typedef struct {
+        fibril_mutex_t mutex;
+        struct driver *driver;
+} client_t;
 
 typedef enum {
@@ -96 +101 @@
         /** List of device ids for device-to-driver matching. */
         match_id_list_t match_ids;
-        /** Pointer to the linked list of devices controlled by this driver. */
-        link_t devices;
+        /** List of devices controlled by this driver. */
+        list_t devices;
         
         /**
@@ -108 +113 @@
 typedef struct driver_list {
         /** List of drivers */
-        link_t drivers;
+        list_t drivers;
         /** Fibril mutex for list of drivers. */
         fibril_mutex_t drivers_mutex;
 } driver_list_t;
 
-/** The state of the device. */
+/** Device state */
 typedef enum {
         DEVICE_NOT_INITIALIZED = 0,
         DEVICE_USABLE,
         DEVICE_NOT_PRESENT,
-        DEVICE_INVALID
+        DEVICE_INVALID,
+        /** Device node has been removed from the tree */
+        DEVICE_REMOVED
 } device_state_t;
 
 /** Device node in the device tree. */
 struct dev_node {
+        /** Reference count */
+        atomic_t refcnt;
+        
         /** The global unique identifier of the device. */
         devman_handle_t handle;
@@ -130 +140 @@
         
         /** List of device functions. */
-        link_t functions;
+        list_t functions;
         /** Driver of this device. */
         driver_t *drv;
@@ -149 +159 @@
 };
 
+/** Function state */
+typedef enum {
+        FUN_INIT = 0,
+        FUN_OFF_LINE,
+        FUN_ON_LINE,
+        /** Function node has been removed from the tree */
+        FUN_REMOVED
+} fun_state_t;
+
 /** Function node in the device tree. */
 struct fun_node {
+        /** Reference count */
+        atomic_t refcnt;
+        /** State */
+        fun_state_t state;
+        
         /** The global unique identifier of the function */
         devman_handle_t handle;
         /** Name of the function, assigned by the device driver */
         char *name;
+        /** Function type */
+        fun_type_t ftype;
         
         /** Full path and name of the device in device hierarchy */
@@ -170 +196 @@
         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;
+        /** Service ID if the device function is registered with loc. */
+        service_id_t service_id;
         
         /**
@@ -181 +205 @@
         
         /**
-         * Used by the hash table of functions indexed by devmap device handles.
-         */
-        link_t devmap_fun;
+         * Used by the hash table of functions indexed by service IDs.
+         */
+        link_t loc_fun;
 };
 
@@ -208 +232 @@
         
         /**
-         * Hash table of devices registered by devmapper, indexed by devmap
-         * handles.
-         */
-        hash_table_t devmap_functions;
+         * Hash table of services registered with location service, indexed by
+         * service IDs.
+         */
+        hash_table_t loc_functions;
 } dev_tree_t;
-
-typedef struct dev_class {
-        /** The name of the class. */
-        const char *name;
-        
-        /**
-         * Pointer to the previous and next class in the list of registered
-         * classes.
-         */
-        link_t link;
-        
-        /**
-         * List of dev_class_info structures - one for each device registered by
-         * this class.
-         */
-        link_t devices;
-        
-        /**
-         * Default base name for the device within the class, might be overrided
-         * by the driver.
-         */
-        const char *base_dev_name;
-        
-        /** Unique numerical identifier of the newly added device. */
-        size_t curr_dev_idx;
-        /** Synchronize access to the list of devices in this class. */
-        fibril_mutex_t mutex;
-} dev_class_t;
-
-/**
- * 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 {
-        /** The class. */
-        dev_class_t *dev_class;
-        /** The device. */
-        fun_node_t *fun;
-        
-        /**
-         * Pointer to the previous and next class info in the list of devices
-         * registered by the class.
-         */
-        link_t link;
-        
-        /**
-         * Pointer to the previous and next class info in the list of classes
-         * by which the device is registered.
-         */
-        link_t dev_classes;
-        
-        /** The name of the device function within the class. */
-        char *dev_name;
-        /** The handle of the device by device mapper in the class namespace. */
-        devmap_handle_t devmap_handle;
-        
-        /**
-         * Link in the hash table of devices registered by the devmapper using
-         * their class names.
-         */
-        link_t devmap_link;
-} dev_class_info_t;
-
-/** The list of device classes. */
-typedef struct class_list {
-        /** List of classes. */
-        link_t classes;
-        
-        /**
-         * Hash table of devices registered by devmapper using their class name,
-         * indexed by devmap handles.
-         */
-        hash_table_t devmap_functions;
-        
-        /** Fibril mutex for list of classes. */
-        fibril_rwlock_t rwlock;
-} class_list_t;
 
 /* Match ids and scores */
@@ -312 +258 @@
 
 extern void add_driver(driver_list_t *, driver_t *);
-extern void attach_driver(dev_node_t *, driver_t *);
-extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
+extern void attach_driver(dev_tree_t *, dev_node_t *, driver_t *);
+extern void detach_driver(dev_tree_t *, dev_node_t *);
+extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
+extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
+extern int driver_fun_online(dev_tree_t *, fun_node_t *);
+extern int driver_fun_offline(dev_tree_t *, fun_node_t *);
 
 extern driver_t *find_driver(driver_list_t *, const char *);
@@ -327 +277 @@
 extern dev_node_t *create_dev_node(void);
 extern void delete_dev_node(dev_node_t *node);
+extern void dev_add_ref(dev_node_t *);
+extern void dev_del_ref(dev_node_t *);
 extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
     devman_handle_t handle);
 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 int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
+    size_t, size_t *);
 
 extern fun_node_t *create_fun_node(void);
 extern void delete_fun_node(fun_node_t *);
+extern void fun_add_ref(fun_node_t *);
+extern void fun_del_ref(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 *);
-extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
-extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
+extern fun_node_t *find_fun_node_in_device(dev_tree_t *tree, dev_node_t *,
+    const char *);
 
 /* Device tree */
@@ -346 +302 @@
 extern bool create_root_nodes(dev_tree_t *);
 extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
+extern void remove_dev_node(dev_tree_t *, dev_node_t *);
 extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
-
-/* Device classes */
-
-extern dev_class_t *create_dev_class(void);
-extern dev_class_info_t *create_dev_class_info(void);
-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_function_to_class(fun_node_t *, dev_class_t *,
-    const char *);
-
-extern void init_class_list(class_list_t *);
-
-extern dev_class_t *get_dev_class(class_list_t *, char *);
-extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
-extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
-extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
-
-/* Devmap devices */
-
-extern void devmap_register_tree_function(fun_node_t *, dev_tree_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 *);
+extern void remove_fun_node(dev_tree_t *, fun_node_t *);
+
+/* Loc services */
+
+extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
+
+extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
+
+extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);
 
 #endif

uspace/srv/devman/main.c

@@ -56 +56 @@
 #include <ipc/driver.h>
 #include <thread.h>
-#include <devmap.h>
+#include <loc.h>
 
 #include "devman.h"
@@ -64 +64 @@
 static driver_list_t drivers_list;
 static dev_tree_t device_tree;
-static class_list_t class_list;
+
+static int init_running_drv(void *drv);
 
 /** Register running driver. */
-static driver_t *devman_driver_register(void)
-{
-        ipc_call_t icall;
-        ipc_callid_t iid;
+static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call)
+{
         driver_t *driver = NULL;
+        char *drv_name = NULL;
 
         log_msg(LVL_DEBUG, "devman_driver_register");
-        
-        iid = async_get_call(&icall);
-        if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) {
-                async_answer_0(iid, EREFUSED);
-                return NULL;
-        }
-        
-        char *drv_name = NULL;
         
         /* Get driver name. */
         int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
+                async_answer_0(callid, rc);
                 return NULL;
         }
@@ -99 +91 @@
                 free(drv_name);
                 drv_name = NULL;
-                async_answer_0(iid, ENOENT);
+                async_answer_0(callid, ENOENT);
                 return NULL;
         }
@@ -113 +105 @@
                     driver->name);
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(iid, EEXISTS);
+                async_answer_0(callid, EEXISTS);
                 return NULL;
         }
@@ -135 +127 @@
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
             driver->name);
-        driver->sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        driver->sess = async_callback_receive(EXCHANGE_PARALLEL);
         if (!driver->sess) {
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(iid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
                 return NULL;
         }
-        
-        fibril_mutex_unlock(&driver->driver_mutex);
+        /* FIXME: Work around problem with callback sessions */
+        async_sess_args_set(driver->sess, DRIVER_DEVMAN, 0, 0);
         
         log_msg(LVL_NOTE,
@@ -148 +140 @@
             driver->name);
         
-        async_answer_0(iid, EOK);
-        
+        /*
+         * Initialize the driver as running (e.g. pass assigned devices to it)
+         * in a separate fibril; the separate fibril is used to enable the
+         * driver to use devman service during the driver's initialization.
+         */
+        fid_t fid = fibril_create(init_running_drv, driver);
+        if (fid == 0) {
+                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
+                    "for driver `%s'.", driver->name);
+                fibril_mutex_unlock(&driver->driver_mutex);
+                async_answer_0(callid, ENOMEM);
+                return NULL;
+        }
+        
+        fibril_add_ready(fid);
+        fibril_mutex_unlock(&driver->driver_mutex);
+        
+        async_answer_0(callid, EOK);
         return driver;
 }
@@ -226 +234 @@
         dev_node_t *dev_node = (dev_node_t *) arg;
         assign_driver(dev_node, &drivers_list, &device_tree);
+
+        /* Delete one reference we got from the caller. */
+        dev_del_ref(dev_node);
         return EOK;
 }
 
-/** Handle function registration.
- *
- * Child devices are registered by their parent's device driver.
- */
-static void devman_add_function(ipc_callid_t callid, ipc_call_t *call)
-{
-        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
-        devman_handle_t dev_handle = IPC_GET_ARG2(*call);
-        sysarg_t match_count = IPC_GET_ARG3(*call);
-        dev_tree_t *tree = &device_tree;
-        
-        fibril_rwlock_write_lock(&tree->rwlock);
-
-        dev_node_t *dev = NULL;
-        dev_node_t *pdev = find_dev_node_no_lock(&device_tree, dev_handle);
-        
-        if (pdev == NULL) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
-                async_answer_0(callid, ENOENT);
-                return;
-        }
-        
-        if (ftype != fun_inner && ftype != fun_exposed) {
-                /* Unknown function type */
-                log_msg(LVL_ERROR, 
-                    "Unknown function type %d provided by driver.",
-                    (int) ftype);
-
-                fibril_rwlock_write_unlock(&tree->rwlock);
-                async_answer_0(callid, EINVAL);
-                return;
-        }
-        
-        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);
-                async_answer_0(callid, rc);
-                return;
-        }
-        
-        /* Check that function with same name is not there already. */
-        if (find_fun_node_in_device(pdev, fun_name) != NULL) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
-                async_answer_0(callid, EEXISTS);
-                printf(NAME ": Warning, driver tried to register `%s' twice.\n",
-                    fun_name);
-                free(fun_name);
-                return;
-        }
-
-        fun_node_t *fun = create_fun_node();
-        if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
-                delete_fun_node(fun);
-                async_answer_0(callid, ENOMEM);
-                return;
-        }
-
-        if (ftype == fun_inner) {
+static int online_function(fun_node_t *fun)
+{
+        dev_node_t *dev;
+        
+        fibril_rwlock_write_lock(&device_tree.rwlock);
+
+        if (fun->state == FUN_ON_LINE) {
+                fibril_rwlock_write_unlock(&device_tree.rwlock);
+                log_msg(LVL_WARN, "Function %s is already on line.",
+                    fun->pathname);
+                return EOK;
+        }
+        
+        if (fun->ftype == fun_inner) {
                 dev = create_dev_node();
                 if (dev == NULL) {
-                        fibril_rwlock_write_unlock(&tree->rwlock);
-                        delete_fun_node(fun);
-                        async_answer_0(callid, ENOMEM);
-                        return;
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        return ENOMEM;
                 }
 
-                insert_dev_node(tree, dev, fun);
-        }
-
-        fibril_rwlock_write_unlock(&tree->rwlock);
+                insert_dev_node(&device_tree, dev, fun);
+                dev_add_ref(dev);
+        }
         
         log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname);
         
-        devman_receive_match_ids(match_count, &fun->match_ids);
-
-        if (ftype == fun_inner) {
+        if (fun->ftype == fun_inner) {
+                dev = fun->child;
                 assert(dev != NULL);
+                
+                /* Give one reference over to assign_driver_fibril(). */
+                dev_add_ref(dev);
                 /*
                  * Try to find a suitable driver and assign it to the device.  We do
@@ -317 +281 @@
                 fid_t assign_fibril = fibril_create(assign_driver_fibril, dev);
                 if (assign_fibril == 0) {
-                        /*
-                         * Fallback in case we are out of memory.
-                         * Probably not needed as we will die soon anyway ;-).
-                         */
-                        (void) assign_driver_fibril(fun);
-                } else {
-                        fibril_add_ready(assign_fibril);
+                        log_msg(LVL_ERROR, "Failed to create fibril for "
+                            "assigning driver.");
+                        /* XXX Cleanup */
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        return ENOMEM;
+                }
+                fibril_add_ready(assign_fibril);
+        } else {
+                loc_register_tree_function(fun, &device_tree);
+        }
+        
+        fibril_rwlock_write_unlock(&device_tree.rwlock);
+        
+        return EOK;
+}
+
+static int offline_function(fun_node_t *fun)
+{
+        int rc;
+        
+        fibril_rwlock_write_lock(&device_tree.rwlock);
+        
+        if (fun->state == FUN_OFF_LINE) {
+                fibril_rwlock_write_unlock(&device_tree.rwlock);
+                log_msg(LVL_WARN, "Function %s is already off line.",
+                    fun->pathname);
+                return EOK;
+        }
+        
+        if (fun->ftype == fun_inner) {
+                log_msg(LVL_DEBUG, "Offlining inner function %s.",
+                    fun->pathname);
+                
+                if (fun->child != NULL) {
+                        dev_node_t *dev = fun->child;
+                        
+                        dev_add_ref(dev);
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        
+                        /* If device is owned by driver, ask driver to give it up. */
+                        if (dev->state == DEVICE_USABLE) {
+                                rc = driver_dev_remove(&device_tree, dev);
+                                if (rc != EOK) {
+                                        dev_del_ref(dev);
+                                        return ENOTSUP;
+                                }
+                        }
+                        
+                        /* Verify that driver removed all functions */
+                        fibril_rwlock_read_lock(&device_tree.rwlock);
+                        if (!list_empty(&dev->functions)) {
+                                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                                return EIO;
+                        }
+                        driver_t *driver = dev->drv;
+                        fibril_rwlock_read_unlock(&device_tree.rwlock);
+                        
+                        if (driver)
+                                detach_driver(&device_tree, dev);
+                        
+                        fibril_rwlock_write_lock(&device_tree.rwlock);
+                        remove_dev_node(&device_tree, dev);
+                        
+                        /* Delete ref created when node was inserted */
+                        dev_del_ref(dev);
+                        /* Delete ref created by dev_add_ref(dev) above */
+                        dev_del_ref(dev);
                 }
         } else {
-                devmap_register_tree_function(fun, tree);
+                /* Unregister from location service */
+                rc = loc_service_unregister(fun->service_id);
+                if (rc != EOK) {
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
+                        log_msg(LVL_ERROR, "Failed unregistering tree service.");
+                        return EIO;
+                }
+                
+                fun->service_id = 0;
+        }
+        
+        fun->state = FUN_OFF_LINE;
+        fibril_rwlock_write_unlock(&device_tree.rwlock);
+        
+        return EOK;
+}
+
+/** Handle function registration.
+ *
+ * Child devices are registered by their parent's device driver.
+ */
+static void devman_add_function(ipc_callid_t callid, ipc_call_t *call)
+{
+        fun_type_t ftype = (fun_type_t) IPC_GET_ARG1(*call);
+        devman_handle_t dev_handle = IPC_GET_ARG2(*call);
+        sysarg_t match_count = IPC_GET_ARG3(*call);
+        dev_tree_t *tree = &device_tree;
+        
+        dev_node_t *pdev = find_dev_node(&device_tree, dev_handle);
+        if (pdev == NULL) {
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        if (ftype != fun_inner && ftype != fun_exposed) {
+                /* Unknown function type */
+                log_msg(LVL_ERROR, 
+                    "Unknown function type %d provided by driver.",
+                    (int) ftype);
+
+                dev_del_ref(pdev);
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+        
+        char *fun_name = NULL;
+        int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                dev_del_ref(pdev);
+                async_answer_0(callid, rc);
+                return;
+        }
+        
+        fibril_rwlock_write_lock(&tree->rwlock);
+        
+        /* Check device state */
+        if (pdev->state == DEVICE_REMOVED) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                dev_del_ref(pdev);
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        /* Check that function with same name is not there already. */
+        if (find_fun_node_in_device(tree, pdev, fun_name) != NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                dev_del_ref(pdev);
+                async_answer_0(callid, EEXISTS);
+                printf(NAME ": Warning, driver tried to register `%s' twice.\n",
+                    fun_name);
+                free(fun_name);
+                return;
+        }
+        
+        fun_node_t *fun = create_fun_node();
+        fun_add_ref(fun);
+        fun->ftype = ftype;
+        
+        if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                dev_del_ref(pdev);
+                delete_fun_node(fun);
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+        
+        fibril_rwlock_write_unlock(&tree->rwlock);
+        dev_del_ref(pdev);
+        
+        devman_receive_match_ids(match_count, &fun->match_ids);
+        
+        rc = online_function(fun);
+        if (rc != EOK) {
+                /* XXX clean up */
+                async_answer_0(callid, rc);
+                return;
         }
         
@@ -333 +452 @@
 }
 
-static void devmap_register_class_dev(dev_class_info_t *cli)
-{
-        /* Create devmap path and name for the device. */
-        char *devmap_pathname = NULL;
-
-        asprintf(&devmap_pathname, "%s/%s%c%s", DEVMAP_CLASS_NAMESPACE,
-            cli->dev_class->name, DEVMAP_SEPARATOR, cli->dev_name);
-        if (devmap_pathname == NULL)
-                return;
-        
-        /*
-         * Register the device by the device mapper and remember its devmap
-         * handle.
-         */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
-        
-        /*
-         * Add device to the hash map of class devices registered by device
-         * mapper.
-         */
-        class_add_devmap_function(&class_list, cli);
-        
-        free(devmap_pathname);
-}
-
-static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call)
+static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call)
 {
         devman_handle_t handle = IPC_GET_ARG1(*call);
-        
-        /* Get class name. */
-        char *class_name;
-        int rc = async_data_write_accept((void **) &class_name, true,
+        category_id_t cat_id;
+        int rc;
+        
+        /* Get category name. */
+        char *cat_name;
+        rc = async_data_write_accept((void **) &cat_name, true,
             0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
                 return;
-        }       
+        }
         
         fun_node_t *fun = find_fun_node(&device_tree, handle);
@@ -378 +473 @@
         }
         
-        dev_class_t *cl = get_dev_class(&class_list, class_name);
-        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);
-        
-        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.",
-            fun->pathname, class_name, class_info->dev_name);
-
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING);
+        if (rc == EOK) {
+                loc_service_add_to_cat(fun->service_id, cat_id);
+        } else {
+                log_msg(LVL_ERROR, "Failed adding function `%s' to category "
+                    "`%s'.", fun->pathname, cat_name);
+        }
+        
+        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+            fun->pathname, cat_name);
+
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        fun_del_ref(fun);
+
+        async_answer_0(callid, EOK);
+}
+
+/** Online function by driver request.
+ *
+ */
+static void devman_drv_fun_online(ipc_callid_t iid, ipc_call_t *icall,
+    driver_t *drv)
+{
+        fun_node_t *fun;
+        int rc;
+
+        printf("devman_drv_fun_online()\n");
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        if (fun->dev == NULL || fun->dev->drv != drv) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                fun_del_ref(fun);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        
+        rc = online_function(fun);
+        if (rc != EOK) {
+                printf("devman_drv_fun_online() online_fun->ERROR\n");
+                fun_del_ref(fun);
+                async_answer_0(iid, (sysarg_t) rc);
+                return;
+        }
+        
+        fun_del_ref(fun);
+        printf("devman_drv_fun_online() online_fun->OK\n");
+        
+        async_answer_0(iid, (sysarg_t) EOK);
+}
+
+
+/** Offline function by driver request.
+ *
+ */
+static void devman_drv_fun_offline(ipc_callid_t iid, ipc_call_t *icall,
+    driver_t *drv)
+{
+        fun_node_t *fun;
+        int rc;
+
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        fibril_rwlock_write_lock(&device_tree.rwlock);
+        if (fun->dev == NULL || fun->dev->drv != drv) {
+                fun_del_ref(fun);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        fibril_rwlock_write_unlock(&device_tree.rwlock);
+        
+        rc = offline_function(fun);
+        if (rc != EOK) {
+                fun_del_ref(fun);
+                async_answer_0(iid, (sysarg_t) rc);
+                return;
+        }
+        
+        fun_del_ref(fun);
+        async_answer_0(iid, (sysarg_t) EOK);
+}
+
+/** Remove function. */
+static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call)
+{
+        devman_handle_t fun_handle = IPC_GET_ARG1(*call);
+        dev_tree_t *tree = &device_tree;
+        int rc;
+        
+        
+        fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
+        if (fun == NULL) {
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        fibril_rwlock_write_lock(&tree->rwlock);
+        
+        log_msg(LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname);
+        
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        if (fun->ftype == fun_inner) {
+                /* Handle possible descendants */
+                /* TODO - This is a surprise removal */
+                if (fun->child != NULL) {
+                        log_msg(LVL_WARN, "devman_remove_function(): not handling "
+                            "descendants\n");
+                }
+        } else {
+                if (fun->service_id != 0) {
+                        /* Unregister from location service */
+                        rc = loc_service_unregister(fun->service_id);
+                        if (rc != EOK) {
+                                log_msg(LVL_ERROR, "Failed unregistering tree "
+                                    "service.");
+                                fibril_rwlock_write_unlock(&tree->rwlock);
+                                fun_del_ref(fun);
+                                async_answer_0(callid, EIO);
+                                return;
+                        }
+                }
+        }
+        
+        remove_fun_node(&device_tree, fun);
+        fibril_rwlock_write_unlock(&tree->rwlock);
+        
+        /* Delete ref added when inserting function into tree */
+        fun_del_ref(fun);
+        /* Delete ref added above when looking up function */
+        fun_del_ref(fun);
+        
+        log_msg(LVL_DEBUG, "devman_remove_function() succeeded.");
         async_answer_0(callid, EOK);
 }
@@ -408 +650 @@
 static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
+        client_t *client;
+        driver_t *driver;
+        
         /* Accept the connection. */
         async_answer_0(iid, EOK);
         
-        driver_t *driver = devman_driver_register();
-        if (driver == NULL)
-                return;
-        
-        /*
-         * Initialize the driver as running (e.g. pass assigned devices to it)
-         * in a separate fibril; the separate fibril is used to enable the
-         * driver to use devman service during the driver's initialization.
-         */
-        fid_t fid = fibril_create(init_running_drv, driver);
-        if (fid == 0) {
-                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
-                    "for driver `%s'.", driver->name);
-                return;
-        }
-        fibril_add_ready(fid);
+        client = async_get_client_data();
+        if (client == NULL) {
+                log_msg(LVL_ERROR, "Failed to allocate client data.");
+                return;
+        }
         
         while (true) {
@@ -435 +669 @@
                         break;
                 
+                if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) {
+                        fibril_mutex_lock(&client->mutex);
+                        driver = client->driver;
+                        fibril_mutex_unlock(&client->mutex);
+                        if (driver == NULL) {
+                                /* First call must be to DEVMAN_DRIVER_REGISTER */
+                                async_answer_0(callid, ENOTSUP);
+                                continue;
+                        }
+                }
+                
                 switch (IPC_GET_IMETHOD(call)) {
+                case DEVMAN_DRIVER_REGISTER:
+                        fibril_mutex_lock(&client->mutex);
+                        if (client->driver != NULL) {
+                                fibril_mutex_unlock(&client->mutex);
+                                async_answer_0(callid, EINVAL);
+                                continue;
+                        }
+                        client->driver = devman_driver_register(callid, &call);
+                        fibril_mutex_unlock(&client->mutex);
+                        break;
                 case DEVMAN_ADD_FUNCTION:
                         devman_add_function(callid, &call);
                         break;
-                case DEVMAN_ADD_DEVICE_TO_CLASS:
-                        devman_add_function_to_class(callid, &call);
+                case DEVMAN_ADD_DEVICE_TO_CATEGORY:
+                        devman_add_function_to_cat(callid, &call);
+                        break;
+                case DEVMAN_DRV_FUN_ONLINE:
+                        devman_drv_fun_online(callid, &call, driver);
+                        break;
+                case DEVMAN_DRV_FUN_OFFLINE:
+                        devman_drv_fun_offline(callid, &call, driver);
+                        break;
+                case DEVMAN_REMOVE_FUNCTION:
+                        devman_remove_function(callid, &call);
                         break;
                 default:
-                        async_answer_0(callid, EINVAL); 
+                        async_answer_0(callid, EINVAL);
                         break;
                 }
@@ -454 +718 @@
 {
         char *pathname;
+        devman_handle_t handle;
         
         int rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0);
@@ -470 +735 @@
         }
 
-        async_answer_1(iid, EOK, fun->handle);
-}
-
-/** Find handle for the device instance identified by device class name. */
-static void devman_function_get_handle_by_class(ipc_callid_t iid,
-    ipc_call_t *icall)
-{
-        char *classname;
-        char *devname;
-
-        int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0);
-        if (rc != EOK) {
-                free(classname);
-                async_answer_0(iid, rc);
-                return;
-        }
-
-
-        fun_node_t *fun = find_fun_node_by_class(&class_list,
-            classname, devname);
-
-        free(classname);
-        free(devname);
-
-        if (fun == NULL) {
-                async_answer_0(iid, ENOENT);
-                return;
-        }
-
-        async_answer_1(iid, EOK, fun->handle);
-}
-
-/** Find device path by its handle. */
-static void devman_get_device_path_by_handle(ipc_callid_t iid,
-    ipc_call_t *icall)
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        handle = fun->handle;
+
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+
+        /* Delete reference created above by find_fun_node_by_path() */
+        fun_del_ref(fun);
+
+        async_answer_1(iid, EOK, handle);
+}
+
+/** Get device name. */
+static void devman_fun_get_name(ipc_callid_t iid, ipc_call_t *icall)
 {
         devman_handle_t handle = IPC_GET_ARG1(*icall);
@@ -523 +768 @@
         if (!async_data_read_receive(&data_callid, &data_len)) {
                 async_answer_0(iid, EINVAL);
+                fun_del_ref(fun);
                 return;
         }
@@ -530 +776 @@
                 async_answer_0(data_callid, ENOMEM);
                 async_answer_0(iid, ENOMEM);
-                return;
-        }
-
+                fun_del_ref(fun);
+                return;
+        }
+
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                free(buffer);
+
+                async_answer_0(data_callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                fun_del_ref(fun);
+                return;
+        }
+
+        size_t sent_length = str_size(fun->name);
+        if (sent_length > data_len) {
+                sent_length = data_len;
+        }
+
+        async_data_read_finalize(data_callid, fun->name, sent_length);
+        async_answer_0(iid, EOK);
+
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        fun_del_ref(fun);
+        free(buffer);
+}
+
+
+/** Get device path. */
+static void devman_fun_get_path(ipc_callid_t iid, ipc_call_t *icall)
+{
+        devman_handle_t handle = IPC_GET_ARG1(*icall);
+
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        ipc_callid_t data_callid;
+        size_t data_len;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(iid, EINVAL);
+                fun_del_ref(fun);
+                return;
+        }
+
+        void *buffer = malloc(data_len);
+        if (buffer == NULL) {
+                async_answer_0(data_callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                fun_del_ref(fun);
+                return;
+        }
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                free(buffer);
+
+                async_answer_0(data_callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                fun_del_ref(fun);
+                return;
+        }
+        
         size_t sent_length = str_size(fun->pathname);
         if (sent_length > data_len) {
@@ -541 +855 @@
         async_answer_0(iid, EOK);
 
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        fun_del_ref(fun);
         free(buffer);
 }
 
+static void devman_dev_get_functions(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        int rc;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        dev_node_t *dev = find_dev_node_no_lock(&device_tree,
+            IPC_GET_ARG1(*icall));
+        if (dev == NULL || dev->state == DEVICE_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size);
+        if (hdl_buf == NULL) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        rc = dev_get_functions(&device_tree, dev, hdl_buf, size, &act_size);
+        if (rc != EOK) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        
+        sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size);
+        free(hdl_buf);
+        
+        async_answer_1(iid, retval, act_size);
+}
+
+
+/** Get handle for child device of a function. */
+static void devman_fun_get_child(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fun_node_t *fun;
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        fun = find_fun_node_no_lock(&device_tree, IPC_GET_ARG1(*icall));
+        if (fun == NULL || fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (fun->child == NULL) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        async_answer_1(iid, EOK, fun->child->handle);
+        
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+}
+
+/** Online function.
+ *
+ * Send a request to online a function to the responsible driver.
+ * The driver may offline other functions if necessary (i.e. if the state
+ * of this function is linked to state of another function somehow).
+ */
+static void devman_fun_online(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fun_node_t *fun;
+        int rc;
+
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        rc = driver_fun_online(&device_tree, fun);
+        fun_del_ref(fun);
+        
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
+/** Offline function.
+ *
+ * Send a request to offline a function to the responsible driver. As
+ * a result the subtree rooted at that function should be cleanly
+ * detatched. The driver may offline other functions if necessary
+ * (i.e. if the state of this function is linked to state of another
+ * function somehow).
+ */
+static void devman_fun_offline(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fun_node_t *fun;
+        int rc;
+
+        fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        rc = driver_fun_offline(&device_tree, fun);
+        fun_del_ref(fun);
+        
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
+/** Find handle for the function instance identified by its service ID. */
+static void devman_fun_sid_to_handle(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fun_node_t *fun;
+
+        fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(*icall));
+        
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+
+        /* Check function state */
+        if (fun->state == FUN_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        async_answer_1(iid, EOK, fun->handle);
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        fun_del_ref(fun);
+}
 
 /** Function for handling connections from a client to the device manager. */
@@ -562 +1025 @@
                         devman_function_get_handle(callid, &call);
                         break;
-                case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
-                        devman_function_get_handle_by_class(callid, &call);
-                        break;
-                case DEVMAN_DEVICE_GET_DEVICE_PATH:
-                        devman_get_device_path_by_handle(callid, &call);
+                case DEVMAN_DEV_GET_FUNCTIONS:
+                        devman_dev_get_functions(callid, &call);
+                        break;
+                case DEVMAN_FUN_GET_CHILD:
+                        devman_fun_get_child(callid, &call);
+                        break;
+                case DEVMAN_FUN_GET_NAME:
+                        devman_fun_get_name(callid, &call);
+                        break;
+                case DEVMAN_FUN_GET_PATH:
+                        devman_fun_get_path(callid, &call);
+                        break;
+                case DEVMAN_FUN_ONLINE:
+                        devman_fun_online(callid, &call);
+                        break;
+                case DEVMAN_FUN_OFFLINE:
+                        devman_fun_offline(callid, &call);
+                        break;
+                case DEVMAN_FUN_SID_TO_HANDLE:
+                        devman_fun_sid_to_handle(callid, &call);
                         break;
                 default:
@@ -585 +1063 @@
         if (fun == NULL)
                 dev = find_dev_node(&device_tree, handle);
-        else
+        else {
+                fibril_rwlock_read_lock(&device_tree.rwlock);
                 dev = fun->dev;
+                if (dev != NULL)
+                        dev_add_ref(dev);
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+        }
 
         /*
@@ -598 +1081 @@
                     "function with handle %" PRIun " was found.", handle);
                 async_answer_0(iid, ENOENT);
-                return;
+                goto cleanup;
         }
 
@@ -606 +1089 @@
                     handle);
                 async_answer_0(iid, ENOENT);
-                return;
+                goto cleanup;
         }
         
         driver_t *driver = NULL;
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
         
         if (drv_to_parent) {
@@ -624 +1109 @@
         }
         
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        
         if (driver == NULL) {
                 log_msg(LVL_ERROR, "IPC forwarding refused - " \
                     "the device %" PRIun " is not in usable state.", handle);
                 async_answer_0(iid, ENOENT);
-                return;
+                goto cleanup;
         }
         
@@ -641 +1128 @@
                     "Could not forward to driver `%s'.", driver->name);
                 async_answer_0(iid, EINVAL);
-                return;
+                goto cleanup;
         }
 
@@ -657 +1144 @@
         async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE);
         async_exchange_end(exch);
-}
-
-/** Function for handling connections from a client forwarded by the device
- * mapper to the device manager. */
-static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
-{
-        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
+
+cleanup:
+        if (dev != NULL)
+                dev_del_ref(dev);
+        if (fun != NULL)
+                fun_del_ref(fun);
+}
+
+/** Function for handling connections from a client forwarded by the location
+ * service to the device manager. */
+static void devman_connection_loc(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t service_id = IPC_GET_ARG2(*icall);
         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) {
+        devman_handle_t handle;
+        driver_t *driver;
+
+        fun = find_loc_tree_function(&device_tree, service_id);
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        if (fun == NULL || fun->dev == NULL || fun->dev->drv == NULL) {
+                log_msg(LVL_WARN, "devman_connection_loc(): function "
+                    "not found.\n");
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -677 +1175 @@
         
         dev = fun->dev;
-        
-        if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) {
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        async_exch_t *exch = async_exchange_begin(dev->drv->sess);
-        async_forward_fast(iid, exch, DRIVER_CLIENT, fun->handle, 0,
+        driver = dev->drv;
+        handle = fun->handle;
+        
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_forward_fast(iid, exch, DRIVER_CLIENT, handle, 0,
             IPC_FF_NONE);
         async_exchange_end(exch);
         
         log_msg(LVL_DEBUG,
-            "Forwarding devmapper request for `%s' function to driver `%s'.",
-            fun->pathname, dev->drv->name);
+            "Forwarding loc service request for `%s' function to driver `%s'.",
+            fun->pathname, driver->name);
+
+        fun_del_ref(fun);
 }
 
 /** Function for handling connections to device manager. */
-static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        /* Select interface. */
+static void devman_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        /* Select port. */
         switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
         case DEVMAN_DRIVER:
@@ -708 +1207 @@
                 devman_forward(iid, icall, false);
                 break;
-        case DEVMAN_CONNECT_FROM_DEVMAP:
-                /* Someone connected through devmap node. */
-                devman_connection_devmapper(iid, icall);
+        case DEVMAN_CONNECT_FROM_LOC:
+                /* Someone connected through loc node. */
+                devman_connection_loc(iid, icall);
                 break;
         case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
@@ -722 +1221 @@
 }
 
+static void *devman_client_data_create(void)
+{
+        client_t *client;
+        
+        client = calloc(1, sizeof(client_t));
+        if (client == NULL)
+                return NULL;
+        
+        fibril_mutex_initialize(&client->mutex);
+        return client;
+}
+
+static void devman_client_data_destroy(void *data)
+{
+        free(data);
+}
+
 /** Initialize device manager internal structures. */
 static bool devman_init(void)
@@ -743 +1259 @@
         }
 
-        init_class_list(&class_list);
-        
         /*
-         * !!! devman_connection ... as the device manager is not a real devmap
+         * !!! devman_connection ... as the device manager is not a real loc
          * driver (it uses a completely different ipc protocol than an ordinary
-         * devmap driver) forwarding a connection from client to the devman by
-         * devmapper would not work.
+         * loc driver) forwarding a connection from client to the devman by
+         * location service would not work.
          */
-        devmap_driver_register(NAME, devman_connection);
+        loc_server_register(NAME, devman_connection);
         
         return true;
@@ -760 +1274 @@
         printf(NAME ": HelenOS Device Manager\n");
 
-        if (log_init(NAME, LVL_ERROR) != EOK) {
+        if (log_init(NAME, LVL_WARN) != EOK) {
                 printf(NAME ": Error initializing logging subsystem.\n");
                 return -1;
@@ -770 +1284 @@
         }
         
-        /* Set a handler of incomming connections. */
+        /* Set handlers for incoming connections. */
+        async_set_client_data_constructor(devman_client_data_create);
+        async_set_client_data_destructor(devman_client_data_destroy);
         async_set_client_connection(devman_connection);
 

uspace/srv/devman/match.c

@@ -59 +59 @@
 int get_match_score(driver_t *drv, dev_node_t *dev)
 {
-        link_t *drv_head = &drv->match_ids.ids;
-        link_t *dev_head = &dev->pfun->match_ids.ids;
+        link_t *drv_head = &drv->match_ids.ids.head;
+        link_t *dev_head = &dev->pfun->match_ids.ids.head;
         
-        if (list_empty(drv_head) || list_empty(dev_head))
+        if (list_empty(&drv->match_ids.ids) ||
+            list_empty(&dev->pfun->match_ids.ids)) {
                 return 0;
+        }
         
         /*
@@ -70 +72 @@
         int highest_score = 0;
         
-        link_t *drv_link = drv->match_ids.ids.next;
+        link_t *drv_link = drv->match_ids.ids.head.next;
         while (drv_link != drv_head) {
                 link_t *dev_link = dev_head->next;

uspace/srv/devman/util.c

@@ -91 +91 @@
 }
 
-char *clone_string(const char *s)
-{
-        size_t size = str_size(s) + 1;
-        char *str;
-        
-        str = (char *) malloc(size);
-        if (str != NULL)
-                str_cpy(str, size, s);
-        return str;
-}
-
 void replace_char(char *str, char orig, char repl)
 {
@@ -111 +100 @@
 }
 
-ssize_t safe_read(int fd, void *buffer, size_t size)
-{
-        if (size == 0) {
-                return 0;
-        }
-
-        uint8_t *buf_ptr = (uint8_t *) buffer;
-
-        size_t total_read = 0;
-        while (total_read < size) {
-                ssize_t bytes_read = read(fd, buf_ptr, size - total_read);
-                if (bytes_read < 0) {
-                        /* Error. */
-                        return bytes_read;
-                } else if (bytes_read == 0) {
-                        /* Possibly end of file. */
-                        break;
-                } else {
-                        /* Read at least something. */
-                        buf_ptr += bytes_read;
-                        total_read += bytes_read;
-                }
-        }
-
-        return (ssize_t) total_read;
-}
-
 /** @}
  */

uspace/srv/devman/util.h

@@ -44 +44 @@
 extern size_t get_nonspace_len(const char *);
 extern void free_not_null(const void *);
-extern char *clone_string(const char *);
 extern void replace_char(char *, char, char);
-
-extern ssize_t safe_read(int, void *, size_t);
 
 #endif