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

Timestamp:

2012-11-06T21:03:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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) (6 diffs)

uspace/srv/devman/devman.h

@@ -52 +52 @@
 
 #define MATCH_EXT ".ma"
-#define DEVICE_BUCKETS 256
 
 #define LOC_DEVICE_NAMESPACE "devices"
@@ -151 +150 @@
          * Used by the hash table of devices indexed by devman device handles.
          */
-        link_t devman_dev;
+        ht_link_t devman_dev;
         
         /**
@@ -174 +173 @@
         /** State */
         fun_state_t state;
+        /** Locked while performing reconfiguration operations */
+        fibril_mutex_t busy_lock;
         
         /** The global unique identifier of the function */
@@ -202 +203 @@
          * Used by the hash table of functions indexed by devman device handles.
          */
-        link_t devman_fun;
+        ht_link_t devman_fun;
         
         /**
          * Used by the hash table of functions indexed by service IDs.
          */
-        link_t loc_fun;
+        ht_link_t loc_fun;
 };
 
@@ -279 +280 @@
 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);
@@ -290 +292 @@
 extern void fun_add_ref(fun_node_t *);
 extern void fun_del_ref(fun_node_t *);
+extern void fun_busy_lock(fun_node_t *);
+extern void fun_busy_unlock(fun_node_t *);
 extern fun_node_t *find_fun_node_no_lock(dev_tree_t *tree,
     devman_handle_t handle);