Changes in uspace/srv/devman/devman.h [80a96d2:45059d6b] in mainline

File:

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

uspace/srv/devman/devman.h

@@ -63 +63 @@
 typedef struct fun_node fun_node_t;
 
-typedef struct {
-        fibril_mutex_t mutex;
-        struct driver *driver;
-} client_t;
-
 typedef enum {
         /** Driver has not been started. */
@@ -118 +113 @@
 } driver_list_t;
 
-/** Device state */
+/** The state of the device. */
 typedef enum {
         DEVICE_NOT_INITIALIZED = 0,
         DEVICE_USABLE,
         DEVICE_NOT_PRESENT,
-        DEVICE_INVALID,
-        /** Device node has been removed from the tree */
-        DEVICE_REMOVED
+        DEVICE_INVALID
 } device_state_t;
 
 /** Device node in the device tree. */
 struct dev_node {
-        /** Reference count */
-        atomic_t refcnt;
-        
         /** The global unique identifier of the device. */
         devman_handle_t handle;
@@ -159 +149 @@
 };
 
-/** Function state */
-typedef enum {
-        FUN_INIT = 0,
-        FUN_OFF_LINE,
-        FUN_ON_LINE,
-        /** Function node has been removed from the tree */
-        FUN_REMOVED
-} fun_state_t;
-
 /** Function node in the device tree. */
 struct fun_node {
-        /** Reference count */
-        atomic_t refcnt;
-        /** State */
-        fun_state_t state;
-        
         /** The global unique identifier of the function */
         devman_handle_t handle;
@@ -258 +234 @@
 
 extern void add_driver(driver_list_t *, driver_t *);
-extern void attach_driver(dev_tree_t *, dev_node_t *, driver_t *);
-extern void detach_driver(dev_tree_t *, dev_node_t *);
+extern void attach_driver(dev_node_t *, driver_t *);
 extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
-extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
-extern int driver_dev_gone(dev_tree_t *, dev_node_t *);
-extern int driver_fun_online(dev_tree_t *, fun_node_t *);
-extern int driver_fun_offline(dev_tree_t *, fun_node_t *);
 
 extern driver_t *find_driver(driver_list_t *, const char *);
@@ -278 +249 @@
 extern dev_node_t *create_dev_node(void);
 extern void delete_dev_node(dev_node_t *node);
-extern void dev_add_ref(dev_node_t *);
-extern void dev_del_ref(dev_node_t *);
 extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
     devman_handle_t handle);
@@ -289 +258 @@
 extern fun_node_t *create_fun_node(void);
 extern void delete_fun_node(fun_node_t *);
-extern void fun_add_ref(fun_node_t *);
-extern void fun_del_ref(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 *);
-extern fun_node_t *find_fun_node_in_device(dev_tree_t *tree, dev_node_t *,
-    const char *);
+extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
 
 /* Device tree */
@@ -303 +269 @@
 extern bool create_root_nodes(dev_tree_t *);
 extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
-extern void remove_dev_node(dev_tree_t *, dev_node_t *);
 extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
 extern void remove_fun_node(dev_tree_t *, fun_node_t *);