Changes in uspace/srv/devman/devman.h [15f3c3f:b72efe8] in mainline

File:

• uspace/srv/devman/devman.h (modified) (8 diffs)

uspace/srv/devman/devman.h

@@ -41 +41 @@
 #include <adt/hash_table.h>
 #include <ipc/devman.h>
-#include <ipc/loc.h>
+#include <ipc/devmap.h>
 #include <fibril_synch.h>
 #include <atomic.h>
@@ -53 +53 @@
 #define DEVICE_BUCKETS 256
 
-#define LOC_CLASS_NAMESPACE "class"
-#define LOC_DEVICE_NAMESPACE "devices"
-#define LOC_SEPARATOR '\\'
+#define DEVMAP_CLASS_NAMESPACE "class"
+#define DEVMAP_DEVICE_NAMESPACE "devices"
+#define DEVMAP_SEPARATOR '\\'
 
 struct dev_node;
@@ -172 +172 @@
         /** List of device classes to which this device function belongs. */
         list_t classes;
-        /** Service ID if the device function is registered with loc. */
-        service_id_t service_id;
+        /** Devmap handle if the device function is registered by devmap. */
+        devmap_handle_t devmap_handle;
         
         /**
@@ -181 +181 @@
         
         /**
-         * Used by the hash table of functions indexed by service IDs.
-         */
-        link_t loc_fun;
+         * Used by the hash table of functions indexed by devmap device handles.
+         */
+        link_t devmap_fun;
 };
 
@@ -208 +208 @@
         
         /**
-         * Hash table of services registered with location service, indexed by
-         * service IDs.
-         */
-        hash_table_t loc_functions;
+         * Hash table of devices registered by devmapper, indexed by devmap
+         * handles.
+         */
+        hash_table_t devmap_functions;
 } dev_tree_t;
 
@@ -267 +267 @@
         /** The name of the device function within the class. */
         char *dev_name;
-        /** Service ID in the class namespace. */
-        service_id_t service_id;
-        
-        /**
-         * Link to hash table of services registered with location service using
+        /** 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 loc_link;
+        link_t devmap_link;
 } dev_class_info_t;
 
@@ -283 +283 @@
         
         /**
-         * Hash table of services registered with location service using their
-         * class name, indexed by service IDs.
-         */
-        hash_table_t loc_functions;
+         * 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. */
@@ -364 +364 @@
 extern void add_dev_class_no_lock(class_list_t *, dev_class_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 fun_node_t *find_loc_class_function(class_list_t *, service_id_t);
-
-extern void class_add_loc_function(class_list_t *, dev_class_info_t *);
-extern void tree_add_loc_function(dev_tree_t *, fun_node_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 *);
 
 #endif