Changeset cb569e6 in mainline for uspace/srv/devman

Timestamp:

2010-11-18T21:58:27Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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.

Location:

uspace/srv/devman

Files:

• devman.c (modified) (6 diffs)
• devman.h (modified) (6 diffs)
• main.c (modified) (4 diffs)

uspace/srv/devman/devman.c

@@ -52 +52 @@
 {
         node_t *dev = hash_table_get_instance(item, node_t, devman_link);
-        return (dev->handle == (device_handle_t) key[0]);
+        return (dev->handle == (devman_handle_t) key[0]);
 }
 
@@ -59 +59 @@
 {
         node_t *dev = hash_table_get_instance(item, node_t, devmap_link);
-        return (dev->devmap_handle == (dev_handle_t) key[0]);
+        return (dev->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -782 +782 @@
  * @return              The device node.
  */
-node_t *find_dev_node_no_lock(dev_tree_t *tree, device_handle_t handle)
+node_t *find_dev_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
 {
         unsigned long key = handle;
@@ -795 +795 @@
  * @return              The device node.
  */
-node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle)
+node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle)
 {
         node_t *node = NULL;
@@ -1106 +1106 @@
 /* Devmap devices */
 
-node_t *find_devmap_tree_device(dev_tree_t *tree, dev_handle_t devmap_handle)
+node_t *find_devmap_tree_device(dev_tree_t *tree, devmap_handle_t devmap_handle)
 {
         node_t *dev = NULL;
@@ -1122 +1122 @@
 
 node_t *find_devmap_class_device(class_list_t *classes,
-    dev_handle_t devmap_handle)
+    devmap_handle_t devmap_handle)
 {
         node_t *dev = NULL;

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 *);

uspace/srv/devman/main.c

@@ -202 +202 @@
 static void devman_add_child(ipc_callid_t callid, ipc_call_t *call)
 {
-        device_handle_t parent_handle = IPC_GET_ARG1(*call);
+        devman_handle_t parent_handle = IPC_GET_ARG1(*call);
         ipcarg_t match_count = IPC_GET_ARG2(*call);
         dev_tree_t *tree = &device_tree;
@@ -271 +271 @@
 static void devman_add_device_to_class(ipc_callid_t callid, ipc_call_t *call)
 {
-        device_handle_t handle = IPC_GET_ARG1(*call);
+        devman_handle_t handle = IPC_GET_ARG1(*call);
         
         /* Get class name. */
@@ -414 +414 @@
     bool drv_to_parent)
 {
-        device_handle_t handle = IPC_GET_ARG2(*icall);
+        devman_handle_t handle = IPC_GET_ARG2(*icall);
         
         node_t *dev = find_dev_node(&device_tree, handle);
@@ -464 +464 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        dev_handle_t devmap_handle = IPC_GET_METHOD(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_METHOD(*icall);
         node_t *dev;