Changes in uspace/srv/devman/devman.c [15f3c3f:4022513] in mainline

File:

• uspace/srv/devman/devman.c (modified) (12 diffs)

uspace/srv/devman/devman.c

@@ -37 +37 @@
 #include <ipc/driver.h>
 #include <ipc/devman.h>
-#include <loc.h>
+#include <devmap.h>
 #include <str_error.h>
 #include <stdio.h>
@@ -66 +66 @@
 }
 
-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]);
-}
-
-static int loc_devices_class_compare(unsigned long key[], hash_count_t keys,
+        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, loc_link);
+            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
         assert(class_info != NULL);
 
-        return (class_info->service_id == (service_id_t) key[0]);
+        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -99 +99 @@
 };
 
-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 loc_devices_class_ops = {
+static hash_table_operations_t devmap_devices_class_ops = {
         .hash = devices_hash,
-        .compare = loc_devices_class_compare,
+        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -270 +270 @@
         }
         
-        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 +422 @@
         }
         
-        insert_fun_node(tree, fun, clone_string(""), NULL);
+        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);
@@ -700 +701 @@
 }
 
-/** 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);
 }
 
@@ -855 +856 @@
         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);
@@ -951 +952 @@
                 list_initialize(&res->classes);
                 link_initialize(&res->devman_fun);
-                link_initialize(&res->loc_fun);
+                link_initialize(&res->devmap_fun);
         }
         
@@ -1267 +1268 @@
                 memset(info, 0, sizeof(dev_class_info_t));
                 link_initialize(&info->dev_classes);
-                link_initialize(&info->loc_link);
+                link_initialize(&info->devmap_link);
                 link_initialize(&info->link);
         }
@@ -1413 +1414 @@
         list_initialize(&class_list->classes);
         fibril_rwlock_initialize(&class_list->rwlock);
-        hash_table_create(&class_list->loc_functions, DEVICE_BUCKETS, 1,
-            &loc_devices_class_ops);
-}
-
-
-/* loc devices */
-
-fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id)
+        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);
         
@@ -1435 +1436 @@
 }
 
-fun_node_t *find_loc_class_function(class_list_t *classes,
-    service_id_t 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)service_id;
+        unsigned long key = (unsigned long)devmap_handle;
         
         fibril_rwlock_read_lock(&classes->rwlock);
-        link = hash_table_find(&classes->loc_functions, &key);
+        link = hash_table_find(&classes->devmap_functions, &key);
         if (link != NULL) {
                 cli = hash_table_get_instance(link, dev_class_info_t,
-                    loc_link);
+                    devmap_link);
                 fun = cli->fun;
         }
@@ -1455 +1456 @@
 }
 
-void class_add_loc_function(class_list_t *class_list, dev_class_info_t *cli)
-{
-        unsigned long key = (unsigned long) cli->service_id;
+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->loc_functions, &key, &cli->loc_link);
+        hash_table_insert(&class_list->devmap_functions, &key, &cli->devmap_link);
         fibril_rwlock_write_unlock(&class_list->rwlock);
 
-        assert(find_loc_class_function(class_list, cli->service_id) != NULL);
-}
-
-void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun)
-{
-        unsigned long key = (unsigned long) fun->service_id;
+        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);
 }