Changeset ce89036b in mainline for uspace/srv/devman/devman.h

Timestamp:

2010-06-01T19:49:48Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

a32defa

Parents:

5159ae9

Message:

Add the 'class' namespace to the device mapper. When a driver adds a device to a class, the device is registered with its class specific name by the device mapper in the 'class' namespace.

File:

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

uspace/srv/devman/devman.h

@@ -52 +52 @@
 #define MATCH_EXT ".ma"
 #define DEVICE_BUCKETS 256
+
+#define DEVMAP_CLASS_NAMESPACE "class"
+#define DEVMAP_DEVICE_NAMESPACE "devices"
+#define DEVMAP_SEPARATOR "\\"
 
 struct node;
@@ -149 +153 @@
         /** Hash table of devices registered by devmapper, indexed by devmap handles.*/
         hash_table_t devmap_devices;
-        
 } dev_tree_t;
 
@@ -183 +186 @@
         /** The handle of the device by device mapper in the class namespace.*/
         dev_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;
 
@@ -189 +194 @@
         /** 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_devices;
         /** Fibril mutex for list of classes. */
-        fibril_mutex_t classes_mutex;   
+        fibril_rwlock_t rwlock; 
 } class_list_t;
 
@@ -404 +411 @@
 dev_class_info_t * add_device_to_class(node_t *dev, dev_class_t *cl, const char *base_dev_name);
 
-static inline void init_class_list(class_list_t *class_list)
-{
-        list_initialize(&class_list->classes);
-        fibril_mutex_initialize(&class_list->classes_mutex);
-}
+void init_class_list(class_list_t *class_list);
 
 dev_class_t * get_dev_class(class_list_t *class_list, char *class_name);
@@ -418 +421 @@
 }
 
+
+// devmap devices
+
+node_t *find_devmap_tree_device(dev_tree_t *tree, dev_handle_t devmap_handle);
+node_t *find_devmap_class_device(class_list_t *classes, dev_handle_t devmap_handle);
+
 #endif