Changeset a9b6bec in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2010-12-14T20:19:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

11658b64

Parents:

37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:

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

uspace/lib/c/generic/devman.c

@@ -95 +95 @@
         aid_t req = async_send_2(phone, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -104 +104 @@
         async_set_client_connection(conn);
         
-        ipcarg_t callback_phonehash;
+        sysarg_t callback_phonehash;
         ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
         async_wait_for(req, &retval);
@@ -155 +155 @@
         aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
 
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -192 +192 @@
         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));
+        sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -268 +268 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
+        sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
         if (retval != EOK) {
                 async_wait_for(req, NULL);