Changeset 0b5a4131 in mainline for uspace/srv

Timestamp:

2010-11-18T18:10:11Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c63e70c

Parents:

991f645

Message:

Rename device_handle_t to devman_handle_t and make it explicitly clear that
device_handle_t is a handle understood by devman.

Location:

uspace/srv/devman

Files:

• devman.c (modified) (3 diffs)
• devman.h (modified) (3 diffs)
• main.c (modified) (3 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]);
 }
 
@@ -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;

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;
@@ -179 +179 @@
          * manner.
          */
-        device_handle_t current_handle;
+        devman_handle_t current_handle;
         
         /** Synchronize access to the device tree. */
@@ -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 *);

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