Changeset cb569e6 in mainline for uspace/srv/devman/main.c

Timestamp:

2010-11-18T21:58:27Z (13 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.

File:

• uspace/srv/devman/main.c (modified) (4 diffs)

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;