Changeset 45f04f8 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2010-11-18T18:23:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f0a7971, a7811f17, cb569e6

Parents:

51a268f (diff), c63e70c (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 changes that aim to do a better job in differentiating between
dev_handle_t and device_handle_t, respectively, by renaming these types to
devmap_handle_t and devman_handle_t, respectively.

File:

• uspace/lib/c/generic/devman.c (modified) (7 diffs)

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;