Changeset 0b5a4131 in mainline

Timestamp:

2010-11-18T18:10:11Z (14 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

Files:

• app/test_serial/test_serial.c (modified) (1 diff)
• lib/c/generic/devman.c (modified) (7 diffs)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (3 diffs)
• lib/drv/include/driver.h (modified) (1 diff)
• srv/devman/devman.c (modified) (3 diffs)
• srv/devman/devman.h (modified) (3 diffs)
• srv/devman/main.c (modified) (3 diffs)

uspace/app/test_serial/test_serial.c

@@ -69 +69 @@
         int res;
         res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
-        device_handle_t handle;
+        devman_handle_t handle;
         
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,

uspace/lib/c/generic/devman.c

@@ -141 +141 @@
 
 int devman_child_device_register(
-        const char *name, match_id_list_t *match_ids, device_handle_t parent_handle, device_handle_t *handle)
+        const char *name, match_id_list_t *match_ids, devman_handle_t parent_handle, devman_handle_t *handle)
 {               
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
@@ -180 +180 @@
 }
 
-int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name)
+int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name)
 {
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
@@ -189 +189 @@
         async_serialize_start();
         ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, dev_handle, &answer);
+        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
         
         ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
@@ -224 +224 @@
 }
 
-int devman_device_connect(device_handle_t handle, unsigned int flags)
+int devman_device_connect(devman_handle_t handle, unsigned int flags)
 {
         int phone;
@@ -239 +239 @@
 }
 
-int devman_parent_device_connect(device_handle_t handle, unsigned int flags)
+int devman_parent_device_connect(devman_handle_t handle, unsigned int flags)
 {
         int phone;
@@ -254 +254 @@
 }
 
-int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags)
+int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags)
 {
         int phone = devman_get_phone(DEVMAN_CLIENT, flags);
@@ -280 +280 @@
         if (retval != EOK) {
                 if (handle != NULL)
-                        *handle = (device_handle_t) -1;
+                        *handle = (devman_handle_t) -1;
                 return retval;
         }
         
         if (handle != NULL)
-                *handle = (device_handle_t) IPC_GET_ARG1(answer);
+                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
         
         return retval;

uspace/lib/c/include/devman.h

@@ -46 +46 @@
 
 int devman_driver_register(const char *, async_client_conn_t);
-int devman_child_device_register(const char *, match_id_list_t *, device_handle_t, device_handle_t *);
+int devman_child_device_register(const char *, match_id_list_t *, devman_handle_t, devman_handle_t *);
 
-int devman_device_connect(device_handle_t handle, unsigned int flags);
-int devman_parent_device_connect(device_handle_t handle, unsigned int flags);
+int devman_device_connect(devman_handle_t handle, unsigned int flags);
+int devman_parent_device_connect(devman_handle_t handle, unsigned int flags);
 
-int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags);
+int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags);
 
-int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name);
+int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name);
 
 #endif

uspace/lib/c/include/ipc/devman.h

@@ -42 +42 @@
 #define DEVMAN_NAME_MAXLEN 256
 
-typedef ipcarg_t device_handle_t;
+typedef ipcarg_t devman_handle_t;
 
 /** Ids of device models used for device-to-driver matching.

uspace/lib/drv/generic/driver.c

@@ -139 +139 @@
 }
 
-static device_t * driver_get_device(link_t *devices, device_handle_t handle)
+static device_t * driver_get_device(link_t *devices, devman_handle_t handle)
 {
         device_t *dev = NULL;
@@ -163 +163 @@
         int res = EOK;
         
-        device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -221 +221 @@
          * the device to which the client connected.
          */
-        device_handle_t handle = IPC_GET_ARG2(*icall);
+        devman_handle_t handle = IPC_GET_ARG2(*icall);
         device_t *dev = driver_get_device(&devices, handle);
 

uspace/lib/drv/include/driver.h

@@ -118 +118 @@
          * device manager).
          */
-        device_handle_t handle;
+        devman_handle_t handle;
         
         /**

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