Changeset 3f0a7971 in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-11-18T22:34:23Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63b4f90

Parents:

c7137738 (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

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:

• uspace/srv/devman/devman.c (modified) (6 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;