Changeset 7bdcc45 in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/fs/devfs/devfs_ops.c (modified) (7 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -420 +420 @@
         
         /* Accept the mount options */
-        ipcarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
+        sysarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
             0, NULL);
         if (retval != EOK) {
@@ -575 +575 @@
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
                     IPC_GET_ARG3(*request), &answer);
@@ -584 +584 @@
                 
                 /* Wait for reply from the driver. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 size_t bytes = IPC_GET_ARG1(answer);
@@ -638 +638 @@
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
                     IPC_GET_ARG3(*request), &answer);
@@ -648 +648 @@
                 
                 /* Wait for reply from the driver. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 size_t bytes = IPC_GET_ARG1(answer);
@@ -746 +746 @@
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_2(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_2(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), &answer);
                 
@@ -752 +752 @@
                 
                 /* Wait for reply from the driver */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);