Changes in uspace/srv/devman/devman.h [791f58c:58b833c] in mainline

File:

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

uspace/srv/devman/devman.h

@@ -283 +283 @@
 /* Drivers */
 
-extern void init_driver_list(driver_list_t *);
+/**
+ * Initialize the list of device driver's.
+ *
+ * @param drv_list the list of device driver's.
+ *
+ */
+static inline void init_driver_list(driver_list_t *drv_list)
+{
+        assert(drv_list != NULL);
+        
+        list_initialize(&drv_list->drivers);
+        fibril_mutex_initialize(&drv_list->drivers_mutex);
+}
+
 extern driver_t *create_driver(void);
 extern bool get_driver_info(const char *, const char *, driver_t *);
@@ -298 +311 @@
 extern driver_t *find_driver(driver_list_t *, const char *);
 extern void set_driver_phone(driver_t *, ipcarg_t);
-extern void initialize_running_driver(driver_t *, dev_tree_t *);
-
-extern void init_driver(driver_t *);
-extern void clean_driver(driver_t *);
-extern void delete_driver(driver_t *);
+void initialize_running_driver(driver_t *, dev_tree_t *);
+
+/** Initialize device driver structure.
+ *
+ * @param drv           The device driver structure.
+ */
+static inline void init_driver(driver_t *drv)
+{
+        assert(drv != NULL);
+
+        memset(drv, 0, sizeof(driver_t));
+        list_initialize(&drv->match_ids.ids);
+        list_initialize(&drv->devices);
+        fibril_mutex_initialize(&drv->driver_mutex);
+}
+
+/** Device driver structure clean-up.
+ *
+ * @param drv           The device driver structure.
+ */
+static inline void clean_driver(driver_t *drv)
+{
+        assert(drv != NULL);
+
+        free_not_null(drv->name);
+        free_not_null(drv->binary_path);
+
+        clean_match_ids(&drv->match_ids);
+
+        init_driver(drv);
+}
+
+/** Delete device driver structure.
+ *
+ * @param drv           The device driver structure.
+ */
+static inline void delete_driver(driver_t *drv)
+{
+        assert(drv != NULL);
+        
+        clean_driver(drv);
+        free(drv);
+}
+
 
 /* Device nodes */
 
-extern node_t *create_dev_node(void);
-extern void delete_dev_node(node_t *node);
-extern node_t *find_dev_node_no_lock(dev_tree_t *tree,
-    device_handle_t handle);
-extern node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle);
+/** Create a new device node.
+ *
+ * @return              A device node structure.
+ */
+static inline node_t *create_dev_node(void)
+{
+        node_t *res = malloc(sizeof(node_t));
+        
+        if (res != NULL) {
+                memset(res, 0, sizeof(node_t));
+                list_initialize(&res->children);
+                list_initialize(&res->match_ids.ids);
+                list_initialize(&res->classes);
+        }
+        
+        return res;
+}
+
+/** Delete a device node.
+ *
+ * @param node          The device node structure.
+ */
+static inline void delete_dev_node(node_t *node)
+{
+        assert(list_empty(&node->children));
+        assert(node->parent == NULL);
+        assert(node->drv == NULL);
+        
+        clean_match_ids(&node->match_ids);
+        free_not_null(node->name);
+        free_not_null(node->pathname);
+        free(node);
+}
+
+/** Find the device node structure of the device witch has the specified handle.
+ *
+ * Device tree's rwlock should be held at least for reading.
+ *
+ * @param tree          The device tree where we look for the device node.
+ * @param handle        The handle of the device.
+ * @return              The device node.
+ */
+static inline node_t *find_dev_node_no_lock(dev_tree_t *tree,
+    device_handle_t handle)
+{
+        unsigned long key = handle;
+        link_t *link = hash_table_find(&tree->devman_devices, &key);
+        return hash_table_get_instance(link, node_t, devman_link);
+}
+
+/** Find the device node structure of the device witch has the specified handle.
+ *
+ * @param tree          The device tree where we look for the device node.
+ * @param handle        The handle of the device.
+ * @return              The device node.
+ */
+static inline node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle)
+{
+        node_t *node = NULL;
+        
+        fibril_rwlock_read_lock(&tree->rwlock);
+        node = find_dev_node_no_lock(tree, handle);
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        return node;
+}
+
 extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
 extern node_t *find_node_child(node_t *, const char *);
+
 
 /* Device tree */
@@ -320 +435 @@
 extern bool insert_dev_node(dev_tree_t *, node_t *, char *, 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 *);
+/** Create device class.
+ *
+ * @return      Device class.
+ */
+static inline 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.
+ */
+static inline 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));
+        
+        return info;
+}
+
+static inline 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;
+}
+
 extern char *create_dev_name_for_class(dev_class_t *, const char *);
 extern dev_class_info_t *add_device_to_class(node_t *, dev_class_t *,
@@ -333 +490 @@
 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 void add_dev_class_no_lock(class_list_t *, dev_class_t *);
+
+static inline void add_dev_class_no_lock(class_list_t *class_list,
+    dev_class_t *cl)
+{
+        list_append(&cl->link, &class_list->classes);
+}
+
 
 /* Devmap devices */
@@ -340 +503 @@
 extern node_t *find_devmap_class_device(class_list_t *, dev_handle_t);
 
-extern void class_add_devmap_device(class_list_t *, dev_class_info_t *);
-extern void tree_add_devmap_device(dev_tree_t *, node_t *);
+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