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

Timestamp:

2010-11-19T23:50:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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

@@ -121 +121 @@
 struct node {
         /** The global unique identifier of the device. */
-        device_handle_t handle;
+        devman_handle_t handle;
         /** The name of the device specified by its parent. */
         char *name;
@@ -157 +157 @@
         link_t classes;
         /** Devmap handle if the device is registered by devmapper. */
-        dev_handle_t devmap_handle;
+        devmap_handle_t devmap_handle;
         
         /**
@@ -179 +179 @@
          * manner.
          */
-        device_handle_t current_handle;
+        devman_handle_t current_handle;
         
         /** Synchronize access to the device tree. */
@@ -248 +248 @@
         char *dev_name;
         /** The handle of the device by device mapper in the class namespace. */
-        dev_handle_t devmap_handle;
+        devmap_handle_t devmap_handle;
         
         /**
@@ -309 +309 @@
 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);
+    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 *);
@@ -337 +337 @@
 /* Devmap devices */
 
-extern node_t *find_devmap_tree_device(dev_tree_t *, dev_handle_t);
-extern node_t *find_devmap_class_device(class_list_t *, dev_handle_t);
+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 *);