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

Timestamp:

2010-06-01T20:53:07Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

a6e54c5d

Parents:

ce89036b

Message:

Register devices in the device tree by the device mapper so the device hierarchy can be seen from devfs.

File:

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

uspace/srv/devman/devman.h

@@ -55 +55 @@
 #define DEVMAP_CLASS_NAMESPACE "class"
 #define DEVMAP_DEVICE_NAMESPACE "devices"
-#define DEVMAP_SEPARATOR "\\"
+#define DEVMAP_SEPARATOR '\\'
 
 struct node;
@@ -230 +230 @@
 
 driver_t * find_best_match_driver(driver_list_t *drivers_list, node_t *node);
-bool assign_driver(node_t *node, driver_list_t *drivers_list);
+bool assign_driver(node_t *node, driver_list_t *drivers_list, dev_tree_t *tree);
 
 void add_driver(driver_list_t *drivers_list, driver_t *drv);
 void attach_driver(node_t *node, driver_t *drv);
-void add_device(int phone, driver_t *drv, node_t *node);
+void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree);
 bool start_driver(driver_t *drv);
 
 driver_t * find_driver(driver_list_t *drv_list, const char *drv_name);
 void set_driver_phone(driver_t *driver, ipcarg_t phone);
-void initialize_running_driver(driver_t *driver);
+void initialize_running_driver(driver_t *driver, dev_tree_t *tree);
 
 /** 
@@ -427 +427 @@
 node_t *find_devmap_class_device(class_list_t *classes, dev_handle_t devmap_handle);
 
+
+static inline void class_add_devmap_device(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_devices, &key, &cli->devmap_link);
+        fibril_rwlock_write_unlock(&class_list->rwlock);
+}
+
+static inline void tree_add_devmap_device(dev_tree_t *tree, node_t *node)
+{
+        unsigned long key = (unsigned long)node->devmap_handle;
+        fibril_rwlock_write_lock(&tree->rwlock);
+        hash_table_insert(&tree->devmap_devices, &key, &node->devmap_link);
+        fibril_rwlock_write_unlock(&tree->rwlock);      
+}
+
 #endif