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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/srv/devman/devman.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <adt/hash_table.h>
-#include <ipc/ipc.h>
 #include <ipc/devman.h>
 #include <ipc/devmap.h>
@@ -57 +56 @@
 #define DEVMAP_SEPARATOR '\\'
 
-struct node;
-typedef struct node node_t;
+struct dev_node;
+typedef struct dev_node dev_node_t;
+
+struct fun_node;
+typedef struct fun_node fun_node_t;
 
 typedef enum {
@@ -118 +120 @@
 } device_state_t;
 
-/** Representation of a node in the device tree. */
-struct node {
+/** Device node in the device tree. */
+struct dev_node {
         /** The global unique identifier of the device. */
         devman_handle_t handle;
-        /** The name of the device specified by its parent. */
-        char *name;
-        
-        /**
-         * Full path and name of the device in device hierarchi (i. e. in full
-         * path in device tree).
-         */
-        char *pathname;
-        
-        /** The node of the parent device. */
-        node_t *parent;
-        
-        /**
-         * Pointers to previous and next child devices in the linked list of
-         * parent device's node.
-         */
-        link_t sibling;
-        
-        /** List of child device nodes. */
-        link_t children;
-        /** List of device ids for device-to-driver matching. */
-        match_id_list_t match_ids;
+        
+        /** (Parent) function the device is attached to. */
+        fun_node_t *pfun;
+        
+        /** List of device functions. */
+        link_t functions;
         /** Driver of this device. */
         driver_t *drv;
         /** The state of the device. */
         device_state_t state;
-        /**
-         * Pointer to the previous and next device in the list of devices
-         * owned by one driver.
-         */
+        /** Link to list of devices owned by driver (driver_t.devices) */
         link_t driver_devices;
         
-        /** The list of device classes to which this device belongs. */
-        link_t classes;
-        /** Devmap handle if the device is registered by devmapper. */
-        devmap_handle_t devmap_handle;
-        
         /**
          * Used by the hash table of devices indexed by devman device handles.
          */
-        link_t devman_link;
-        
-        /**
-         * Used by the hash table of devices indexed by devmap device handles.
-         */
-        link_t devmap_link;
-
+        link_t devman_dev;
+        
         /**
          * Whether this device was already passed to the driver.
@@ -174 +147 @@
         bool passed_to_driver;
 };
+
+/** Function node in the device tree. */
+struct fun_node {
+        /** The global unique identifier of the function */
+        devman_handle_t handle;
+        /** Name of the function, assigned by the device driver */
+        char *name;
+        
+        /** Full path and name of the device in device hierarchy */
+        char *pathname;
+        
+        /** Device which this function belongs to */
+        dev_node_t *dev;
+        
+        /** Link to list of functions in the device (ddf_dev_t.functions) */
+        link_t dev_functions;
+        
+        /** Child device node (if any attached). */
+        dev_node_t *child;
+        /** List of device ids for device-to-driver matching. */
+        match_id_list_t match_ids;
+        
+        /** The list of device classes to which this device function belongs. */
+        link_t classes;
+        /** Devmap handle if the device function is registered by devmap. */
+        devmap_handle_t devmap_handle;
+        
+        /**
+         * Used by the hash table of functions indexed by devman device handles.
+         */
+        link_t devman_fun;
+        
+        /**
+         * Used by the hash table of functions indexed by devmap device handles.
+         */
+        link_t devmap_fun;
+};
+
 
 /** Represents device tree. */
 typedef struct dev_tree {
         /** Root device node. */
-        node_t *root_node;
+        fun_node_t *root_node;
         
         /**
@@ -192 +203 @@
         hash_table_t devman_devices;
         
+        /** Hash table of all devices indexed by devman handles. */
+        hash_table_t devman_functions;
+        
         /**
          * Hash table of devices registered by devmapper, indexed by devmap
          * handles.
          */
-        hash_table_t devmap_devices;
+        hash_table_t devmap_functions;
 } dev_tree_t;
 
@@ -228 +242 @@
 
 /**
- * Provides n-to-m mapping between device nodes and classes - each device may
- * be register to the arbitrary number of classes and each class may contain
- * the arbitrary number of devices.
+ * Provides n-to-m mapping between function nodes and classes - each function
+ * can register in an arbitrary number of classes and each class can contain
+ * an arbitrary number of device functions.
  */
 typedef struct dev_class_info {
@@ -236 +250 @@
         dev_class_t *dev_class;
         /** The device. */
-        node_t *dev;
+        fun_node_t *fun;
         
         /**
@@ -250 +264 @@
         link_t dev_classes;
         
-        /** The name of the device within the class. */
+        /** The name of the device function within the class. */
         char *dev_name;
         /** The handle of the device by device mapper in the class namespace. */
@@ -271 +285 @@
          * indexed by devmap handles.
          */
-        hash_table_t devmap_devices;
+        hash_table_t devmap_functions;
         
         /** Fibril mutex for list of classes. */
@@ -279 +293 @@
 /* Match ids and scores */
 
-extern int get_match_score(driver_t *, node_t *);
+extern int get_match_score(driver_t *, dev_node_t *);
 
 extern bool parse_match_ids(char *, match_id_list_t *);
@@ -293 +307 @@
 extern int lookup_available_drivers(driver_list_t *, const char *);
 
-extern driver_t *find_best_match_driver(driver_list_t *, node_t *);
-extern bool assign_driver(node_t *, driver_list_t *, dev_tree_t *);
+extern driver_t *find_best_match_driver(driver_list_t *, dev_node_t *);
+extern bool assign_driver(dev_node_t *, driver_list_t *, dev_tree_t *);
 
 extern void add_driver(driver_list_t *, driver_t *);
-extern void attach_driver(node_t *, driver_t *);
-extern void add_device(int, driver_t *, node_t *, dev_tree_t *);
+extern void attach_driver(dev_node_t *, driver_t *);
+extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
 
@@ -311 +325 @@
 /* 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,
+extern dev_node_t *create_dev_node(void);
+extern void delete_dev_node(dev_node_t *node);
+extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
     devman_handle_t handle);
-extern node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
-extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
-extern node_t *find_node_child(node_t *, const char *);
+extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
+extern dev_node_t *find_dev_function(dev_node_t *, const char *);
+
+extern fun_node_t *create_fun_node(void);
+extern void delete_fun_node(fun_node_t *);
+extern fun_node_t *find_fun_node_no_lock(dev_tree_t *tree,
+    devman_handle_t handle);
+extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
+extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
 
 /* Device tree */
 
 extern bool init_device_tree(dev_tree_t *, driver_list_t *);
-extern bool create_root_node(dev_tree_t *);
-extern bool insert_dev_node(dev_tree_t *, node_t *, char *, node_t *);
+extern bool create_root_nodes(dev_tree_t *);
+extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
+extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
 
 /* Device classes */
@@ -331 +352 @@
 extern size_t get_new_class_dev_idx(dev_class_t *);
 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 *,
+extern dev_class_info_t *add_function_to_class(fun_node_t *, dev_class_t *,
     const char *);
 
@@ -342 +363 @@
 /* Devmap devices */
 
-extern node_t *find_devmap_tree_device(dev_tree_t *, devmap_handle_t);
-extern node_t *find_devmap_class_device(class_list_t *, devmap_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 *);
+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