Changeset a9b6bec in mainline for uspace/lib/c

Timestamp:

2010-12-14T20:19:41Z (15 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.

Location:

uspace/lib/c

Files:

• arch/abs32le/include/inttypes.h (modified) (1 diff)
• arch/amd64/include/inttypes.h (modified) (1 diff)
• arch/arm32/include/inttypes.h (modified) (1 diff)
• arch/ia32/include/inttypes.h (modified) (1 diff)
• arch/ia64/include/inttypes.h (modified) (1 diff)
• arch/mips32/include/inttypes.h (modified) (1 diff)
• arch/ppc32/include/inttypes.h (modified) (1 diff)
• arch/sparc64/include/inttypes.h (modified) (1 diff)
• generic/async.c (modified) (28 diffs)
• generic/cap.c (modified) (2 diffs)
• generic/clipboard.c (modified) (4 diffs)
• generic/device/char.c (modified) (1 diff)
• generic/device/hw_res.c (modified) (1 diff)
• generic/devman.c (modified) (5 diffs)
• generic/devmap.c (modified) (11 diffs)
• generic/event.c (modified) (1 diff)
• generic/io/console.c (modified) (4 diffs)
• generic/io/screenbuffer.c (modified) (3 diffs)
• generic/ipc.c (modified) (28 diffs)
• generic/loader.c (modified) (5 diffs)
• generic/net/icmp_api.c (modified) (2 diffs)
• generic/net/modules.c (modified) (6 diffs)
• generic/net/socket_client.c (modified) (20 diffs)
• generic/task.c (modified) (2 diffs)
• generic/udebug.c (modified) (4 diffs)
• generic/vfs/vfs.c (modified) (21 diffs)
• include/async.h (modified) (6 diffs)
• include/event.h (modified) (1 diff)
• include/io/console.h (modified) (2 diffs)
• include/io/screenbuffer.h (modified) (3 diffs)
• include/ipc/devman.h (modified) (1 diff)
• include/ipc/devmap.h (modified) (1 diff)
• include/ipc/ip.h (modified) (1 diff)
• include/ipc/ipc.h (modified) (6 diffs)
• include/ipc/net.h (modified) (18 diffs)
• include/ipc/socket.h (modified) (5 diffs)
• include/libc.h (modified) (2 diffs)
• include/net/modules.h (modified) (1 diff)

uspace/lib/c/arch/abs32le/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_abs32le_INTTYPES_H_
 
-#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/amd64/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_amd64_INTTYPES_H_
 
-#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId64  /**< Format for native_t. */
+#define PRIun  PRIu64  /**< Format for sysarg_t. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/arm32/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_arm32_INTTYPES_H_
 
-#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/ia32/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_ia32_INTTYPES_H_
 
-#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/ia64/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_ia64_INTTYPES_H_
 
-#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId64  /**< Format for native_t. */
+#define PRIun  PRIu64  /**< Format for sysarg_t. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/mips32/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_mips32_INTTYPES_H_
 
-#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/ppc32/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_ppc32_INTTYPES_H_
 
-#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId32  /**< Format for native_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

uspace/lib/c/arch/sparc64/include/inttypes.h

@@ -34 +34 @@
 #define LIBC_sparc64_INTTYPES_H_
 
-#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIdn  PRId64  /**< Format for native_t. */
+#define PRIun  PRIu64  /**< Format for sysarg_t. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
 

uspace/lib/c/generic/async.c

@@ -120 +120 @@
         ipc_call_t *dataptr;
         
-        ipcarg_t retval;
+        sysarg_t retval;
 } amsg_t;
 
@@ -140 +140 @@
         
         /** Incoming phone hash. */
-        ipcarg_t in_phone_hash;
+        sysarg_t in_phone_hash;
         
         /** Messages that should be delivered to this fibril. */
@@ -288 +288 @@
         list_append(&msg->link, &conn->msg_queue);
         
-        if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP)
+        if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP)
                 conn->close_callid = callid;
         
@@ -401 +401 @@
                          */
                         memset(call, 0, sizeof(ipc_call_t));
-                        IPC_SET_METHOD(*call, IPC_M_PHONE_HUNGUP);
+                        IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
                         futex_up(&async_futex);
                         return conn->close_callid;
@@ -529 +529 @@
  *
  */
-fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
+fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
     ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
 {
@@ -588 +588 @@
         }
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_CONNECT_ME:
         case IPC_M_CONNECT_ME_TO:
@@ -807 +807 @@
  *
  */
-aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
+aid_t async_send_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
 {
         amsg_t *msg = malloc(sizeof(*msg));
@@ -846 +846 @@
  *
  */
-aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+aid_t async_send_slow(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
     ipc_call_t *dataptr)
 {
@@ -875 +875 @@
  *
  */
-void async_wait_for(aid_t amsgid, ipcarg_t *retval)
+void async_wait_for(aid_t amsgid, sysarg_t *retval)
 {
         amsg_t *msg = (amsg_t *) amsgid;
@@ -911 +911 @@
  *
  */
-int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout)
+int async_wait_timeout(aid_t amsgid, sysarg_t *retval, suseconds_t timeout)
 {
         amsg_t *msg = (amsg_t *) amsgid;
@@ -1023 +1023 @@
  *
  */
-ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
-    ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
+sysarg_t async_req_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
+    sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
 {
         ipc_call_t result;
@@ -1031 +1031 @@
             &result);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(eid, &rc);
         
@@ -1072 +1072 @@
  *
  */
-ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
-    ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
+sysarg_t async_req_slow(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
+    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
 {
         ipc_call_t result;
@@ -1080 +1080 @@
             &result);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(eid, &rc);
         
@@ -1113 +1113 @@
  */
 int
-async_connect_me_to(int phoneid, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3)
+async_connect_me_to(int phoneid, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
 {
         int rc;
-        ipcarg_t newphid;
+        sysarg_t newphid;
 
         rc = async_req_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, NULL,
@@ -1140 +1140 @@
  */
 int
-async_connect_me_to_blocking(int phoneid, ipcarg_t arg1, ipcarg_t arg2,
-    ipcarg_t arg3)
+async_connect_me_to_blocking(int phoneid, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3)
 {
         int rc;
-        ipcarg_t newphid;
+        sysarg_t newphid;
 
         rc = async_req_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
@@ -1166 +1166 @@
  * @return              Zero on success or a negative error code from errno.h.
  */
-int async_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
+int async_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
     int *flags)
 {
         int res;
         sysarg_t tmp_flags;
-        res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
-            (ipcarg_t) size, arg, NULL, &tmp_flags);
+        res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
+            (sysarg_t) size, arg, NULL, &tmp_flags);
         if (flags)
                 *flags = tmp_flags;
@@ -1199 +1199 @@
 
         *callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_SHARE_IN)
+        if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_IN)
                 return 0;
         *size = (size_t) IPC_GET_ARG2(data);
@@ -1231 +1231 @@
 int async_share_out_start(int phoneid, void *src, int flags)
 {
-        return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
-            (ipcarg_t) flags);
+        return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
+            (sysarg_t) flags);
 }
 
@@ -1259 +1259 @@
 
         *callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_SHARE_OUT)
+        if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_OUT)
                 return 0;
         *size = (size_t) IPC_GET_ARG2(data);
@@ -1292 +1292 @@
 int async_data_read_start(int phoneid, void *dst, size_t size)
 {
-        return async_req_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
-            (ipcarg_t) size);
+        return async_req_2_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
+            (sysarg_t) size);
 }
 
@@ -1317 +1317 @@
 
         *callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_DATA_READ)
+        if (IPC_GET_IMETHOD(data) != IPC_M_DATA_READ)
                 return 0;
         if (size)
@@ -1345 +1345 @@
  *
  */
-int async_data_read_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
+int async_data_read_forward_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
 {
         ipc_callid_t callid;
@@ -1369 +1369 @@
         }
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(msg, &rc);
         
@@ -1386 +1386 @@
 int async_data_write_start(int phoneid, const void *src, size_t size)
 {
-        return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
-            (ipcarg_t) size);
+        return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
+            (sysarg_t) size);
 }
 
@@ -1412 +1412 @@
         
         *callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
+        if (IPC_GET_IMETHOD(data) != IPC_M_DATA_WRITE)
                 return 0;
         
@@ -1531 +1531 @@
  *
  */
-int async_data_write_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
+int async_data_write_forward_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
 {
         ipc_callid_t callid;
@@ -1555 +1555 @@
         }
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(msg, &rc);
         

uspace/lib/c/generic/cap.c

@@ -31 +31 @@
  */
 /**
- * @file        cap.c
- * @brief       Functions to grant/revoke capabilities to/from a task.
+ * @file  cap.c
+ * @brief Functions to grant/revoke capabilities to/from a task.
  */
 
@@ -38 +38 @@
 #include <task.h>
 #include <libc.h>
-#include <kernel/syscall/sysarg64.h>
 
 /** Grant capabilities to a task.
  *
- * @param id Destination task ID.
+ * @param id   Destination task ID.
  * @param caps Capabilities to grant.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
+ *
  */
 int cap_grant(task_id_t id, unsigned int caps)
 {
-        sysarg64_t arg;
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
+        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
+#endif
         
-        arg.value = (unsigned long long) id;
-
-        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps);
+#ifdef __64_BITS__
+        return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) id, (sysarg_t) caps);
+#endif
 }
 
 /** Revoke capabilities from a task.
  *
- * @param id Destination task ID.
+ * @param id   Destination task ID.
  * @param caps Capabilities to revoke.
  *
  * @return Zero on success or a value from @ref errno.h on failure.
+ *
  */
 int cap_revoke(task_id_t id, unsigned int caps)
 {
-        sysarg64_t arg;
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
+        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
+#endif
         
-        arg.value = (unsigned long long) id;
-
-        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps);
+#ifdef __64_BITS__
+        return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) id, (sysarg_t) caps);
+#endif
 }
 

uspace/lib/c/generic/clipboard.c

@@ -75 +75 @@
                 clip_connect();
                 
-                ipcarg_t rc = async_req_1_0(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE);
+                sysarg_t rc = async_req_1_0(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE);
                 
                 async_serialize_end();
@@ -85 +85 @@
                 
                 aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, NULL);
-                ipcarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
+                sysarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
                 if (rc != EOK) {
-                        ipcarg_t rc_orig;
+                        sysarg_t rc_orig;
                         async_wait_for(req, &rc_orig);
                         async_serialize_end();
@@ -119 +119 @@
                 clip_connect();
                 
-                ipcarg_t size;
-                ipcarg_t tag;
-                ipcarg_t rc = async_req_0_2(clip_phone, CLIPBOARD_CONTENT, &size, &tag);
+                sysarg_t size;
+                sysarg_t tag;
+                sysarg_t rc = async_req_0_2(clip_phone, CLIPBOARD_CONTENT, &size, &tag);
                 
                 async_serialize_end();
@@ -158 +158 @@
                         
                         if (rc != EOK) {
-                                ipcarg_t rc_orig;
+                                sysarg_t rc_orig;
                                 async_wait_for(req, &rc_orig);
                                 async_serialize_end();

uspace/lib/c/generic/device/char.c

@@ -76 +76 @@
         }
         
-        ipcarg_t rc;
+        sysarg_t rc;
         if (ret != EOK) {
                 async_wait_for(req, &rc);

uspace/lib/c/generic/device/hw_res.c

@@ -40 +40 @@
 bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
 {
-        ipcarg_t count = 0;
+        sysarg_t count = 0;
         int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE), GET_RESOURCE_LIST, &count);
         hw_resources->count = count;

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

uspace/lib/c/generic/devmap.c

@@ -107 +107 @@
         aid_t req = async_send_2(phone, DEVMAP_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);
@@ -116 +116 @@
         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);
@@ -145 +145 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -181 +181 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -217 +217 @@
             &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);
@@ -247 +247 @@
                 return phone;
         
-        ipcarg_t type;
+        sysarg_t type;
         int retval = async_req_1_1(phone, DEVMAP_HANDLE_PROBE, handle, &type);
         if (retval != EOK)
@@ -277 +277 @@
                 return -1;
         
-        ipcarg_t null_id;
+        sysarg_t null_id;
         int retval = async_req_0_1(phone, DEVMAP_NULL_CREATE, &null_id);
         if (retval != EOK)
@@ -292 +292 @@
                 return;
         
-        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (ipcarg_t) null_id);
+        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (sysarg_t) null_id);
 }
 
 static size_t devmap_count_namespaces_internal(int phone)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_0_1(phone, DEVMAP_GET_NAMESPACE_COUNT, &count);
         if (retval != EOK)
@@ -307 +307 @@
 static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_1_1(phone, DEVMAP_GET_DEVICE_COUNT, ns_handle, &count);
         if (retval != EOK)
@@ -375 +375 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();
@@ -427 +427 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();

uspace/lib/c/generic/event.c

@@ -49 +49 @@
  * @return Value returned by the kernel.
  */
-int event_subscribe(event_type_t e, ipcarg_t method)
+int event_subscribe(event_type_t e, sysarg_t method)
 {
         return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) e, (sysarg_t) method);

uspace/lib/c/generic/io/console.c

@@ -45 +45 @@
 }
 
-int console_get_size(int phone, ipcarg_t *cols, ipcarg_t *rows)
+int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows)
 {
         return async_req_0_2(phone, CONSOLE_GET_SIZE, cols, rows);
@@ -71 +71 @@
 }
 
-int console_get_color_cap(int phone, ipcarg_t *ccap)
+int console_get_color_cap(int phone, sysarg_t *ccap)
 {
         return async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, ccap);
@@ -81 +81 @@
 }
 
-int console_get_pos(int phone, ipcarg_t *col, ipcarg_t *row)
+int console_get_pos(int phone, sysarg_t *col, sysarg_t *row)
 {
         return async_req_0_2(phone, CONSOLE_GET_POS, col, row);
 }
 
-void console_set_pos(int phone, ipcarg_t col, ipcarg_t row)
+void console_set_pos(int phone, sysarg_t col, sysarg_t row)
 {
         async_msg_2(phone, CONSOLE_GOTO, col, row);
@@ -93 +93 @@
 bool console_get_event(int phone, console_event_t *event)
 {
-        ipcarg_t type;
-        ipcarg_t key;
-        ipcarg_t mods;
-        ipcarg_t c;
+        sysarg_t type;
+        sysarg_t key;
+        sysarg_t mods;
+        sysarg_t c;
         
         int rc = async_req_0_4(phone, CONSOLE_GET_EVENT, &type, &key, &mods, &c);

uspace/lib/c/generic/io/screenbuffer.c

@@ -67 +67 @@
  *
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, ipcarg_t size_x,
-    ipcarg_t size_y)
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, sysarg_t size_x,
+    sysarg_t size_y)
 {
         scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
@@ -110 +110 @@
  *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, ipcarg_t line)
+void screenbuffer_clear_line(screenbuffer_t *scr, sysarg_t line)
 {
-        ipcarg_t x;
+        sysarg_t x;
         
         for (x = 0; x < scr->size_x; x++) {
@@ -141 +141 @@
  *
  */
-void screenbuffer_goto(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y)
+void screenbuffer_goto(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
 {
         scr->position_x = x % scr->size_x;

uspace/lib/c/generic/ipc.c

@@ -38 +38 @@
  */
 /** @file
- */ 
+ */
 
 #include <ipc/ipc.h>
@@ -104 +104 @@
  */
 int
-ipc_call_sync_fast(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
-    ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3,
-    ipcarg_t *result4, ipcarg_t *result5)
+ipc_call_sync_fast(int phoneid, sysarg_t method, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, sysarg_t *result1, sysarg_t *result2, sysarg_t *result3,
+    sysarg_t *result4, sysarg_t *result5)
 {
         ipc_call_t resdata;
@@ -131 +131 @@
 /** Make a synchronous call transmitting 5 arguments of payload.
  *
- * @param phoneid       Phone handle for the call.
- * @param method        Requested method.
- * @param arg1          Service-defined payload argument.
- * @param arg2          Service-defined payload argument.
- * @param arg3          Service-defined payload argument.
- * @param arg4          Service-defined payload argument.
- * @param arg5          Service-defined payload argument.
- * @param result1       If non-NULL, storage for the first return argument.
- * @param result2       If non-NULL, storage for the second return argument.
- * @param result3       If non-NULL, storage for the third return argument.
- * @param result4       If non-NULL, storage for the fourth return argument.
- * @param result5       If non-NULL, storage for the fifth return argument.
- *
- * @return              Negative value means IPC error.
- *                      Otherwise the RETVAL of the answer.
+ * @param phoneid Phone handle for the call.
+ * @param imethod Requested interface and method.
+ * @param arg1    Service-defined payload argument.
+ * @param arg2    Service-defined payload argument.
+ * @param arg3    Service-defined payload argument.
+ * @param arg4    Service-defined payload argument.
+ * @param arg5    Service-defined payload argument.
+ * @param result1 If non-NULL, storage for the first return argument.
+ * @param result2 If non-NULL, storage for the second return argument.
+ * @param result3 If non-NULL, storage for the third return argument.
+ * @param result4 If non-NULL, storage for the fourth return argument.
+ * @param result5 If non-NULL, storage for the fifth return argument.
+ *
+ * @return Negative value means IPC error.
+ *         Otherwise the RETVAL of the answer.
+ *
  */
 int
-ipc_call_sync_slow(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
-    ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *result1,
-    ipcarg_t *result2, ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5)
+ipc_call_sync_slow(int phoneid, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *result1,
+    sysarg_t *result2, sysarg_t *result3, sysarg_t *result4, sysarg_t *result5)
 {
         ipc_call_t data;
-        int callres;
-
-        IPC_SET_METHOD(data, method);
+        
+        IPC_SET_IMETHOD(data, imethod);
         IPC_SET_ARG1(data, arg1);
         IPC_SET_ARG2(data, arg2);
@@ -161 +161 @@
         IPC_SET_ARG4(data, arg4);
         IPC_SET_ARG5(data, arg5);
-
-        callres = __SYSCALL3(SYS_IPC_CALL_SYNC_SLOW, phoneid, (sysarg_t) &data,
-            (sysarg_t) &data);
+        
+        int callres = __SYSCALL3(SYS_IPC_CALL_SYNC_SLOW, phoneid,
+            (sysarg_t) &data, (sysarg_t) &data);
         if (callres)
                 return callres;
-
+        
         if (result1)
                 *result1 = IPC_GET_ARG1(data);
@@ -177 +177 @@
         if (result5)
                 *result5 = IPC_GET_ARG5(data);
-
+        
         return IPC_GET_RETVAL(data);
 }
@@ -183 +183 @@
 /** Syscall to send asynchronous message.
  *
- * @param phoneid       Phone handle for the call.
- * @param data          Call data with the request.
- *
- * @return              Hash of the call or an error code.
+ * @param phoneid Phone handle for the call.
+ * @param data    Call data with the request.
+ *
+ * @return Hash of the call or an error code.
+ *
  */
 static ipc_callid_t _ipc_call_async(int phoneid, ipc_call_t *data)
@@ -277 +278 @@
  * If the call cannot be temporarily made, queue it.
  *
- * @param phoneid       Phone handle for the call.
- * @param method        Requested method.
- * @param arg1          Service-defined payload argument.
- * @param arg2          Service-defined payload argument.
- * @param arg3          Service-defined payload argument.
- * @param arg4          Service-defined payload argument.
- * @param private       Argument to be passed to the answer/error callback.
- * @param callback      Answer or error callback.
- * @param can_preempt   If non-zero, the current fibril will be preempted in
- *                      case the kernel temporarily refuses to accept more
- *                      asynchronous calls.
- */
-void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
+ * @param phoneid     Phone handle for the call.
+ * @param imethod     Requested interface and method.
+ * @param arg1        Service-defined payload argument.
+ * @param arg2        Service-defined payload argument.
+ * @param arg3        Service-defined payload argument.
+ * @param arg4        Service-defined payload argument.
+ * @param private     Argument to be passed to the answer/error callback.
+ * @param callback    Answer or error callback.
+ * @param can_preempt If non-zero, the current fibril will be preempted in
+ *                    case the kernel temporarily refuses to accept more
+ *                    asynchronous calls.
+ *
+ */
+void ipc_call_async_fast(int phoneid, sysarg_t imethod, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, void *private,
     ipc_async_callback_t callback, int can_preempt)
 {
         async_call_t *call = NULL;
-        ipc_callid_t callid;
-
+        
         if (callback) {
                 call = ipc_prepare_async(private, callback);
@@ -301 +302 @@
                         return;
         }
-
+        
         /*
          * We need to make sure that we get callid before another thread
@@ -307 +308 @@
          */
         futex_down(&ipc_futex);
-        callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid, method, arg1,
-            arg2, arg3, arg4);
-
+        ipc_callid_t callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid,
+            imethod, arg1, arg2, arg3, arg4);
+        
         if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
                 if (!call) {
@@ -316 +317 @@
                                 return;
                 }
-                IPC_SET_METHOD(call->u.msg.data, method);
+                IPC_SET_IMETHOD(call->u.msg.data, imethod);
                 IPC_SET_ARG1(call->u.msg.data, arg1);
                 IPC_SET_ARG2(call->u.msg.data, arg2);
@@ -337 +338 @@
  * If the call cannot be temporarily made, queue it.
  *
- * @param phoneid       Phone handle for the call.
- * @param method        Requested method.
- * @param arg1          Service-defined payload argument.
- * @param arg2          Service-defined payload argument.
- * @param arg3          Service-defined payload argument.
- * @param arg4          Service-defined payload argument.
- * @param arg5          Service-defined payload argument.
- * @param private       Argument to be passed to the answer/error callback.
- * @param callback      Answer or error callback.
- * @param can_preempt   If non-zero, the current fibril will be preempted in
- *                      case the kernel temporarily refuses to accept more
- *                      asynchronous calls.
- *
- */
-void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
+ * @param phoneid     Phone handle for the call.
+ * @param imethod     Requested interface and method.
+ * @param arg1        Service-defined payload argument.
+ * @param arg2        Service-defined payload argument.
+ * @param arg3        Service-defined payload argument.
+ * @param arg4        Service-defined payload argument.
+ * @param arg5        Service-defined payload argument.
+ * @param private     Argument to be passed to the answer/error callback.
+ * @param callback    Answer or error callback.
+ * @param can_preempt If non-zero, the current fibril will be preempted in
+ *                    case the kernel temporarily refuses to accept more
+ *                    asynchronous calls.
+ *
+ */
+void ipc_call_async_slow(int phoneid, sysarg_t imethod, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, void *private,
     ipc_async_callback_t callback, int can_preempt)
 {
@@ -362 +363 @@
                 return;
 
-        IPC_SET_METHOD(call->u.msg.data, method);
+        IPC_SET_IMETHOD(call->u.msg.data, imethod);
         IPC_SET_ARG1(call->u.msg.data, arg1);
         IPC_SET_ARG2(call->u.msg.data, arg2);
@@ -393 +394 @@
  * @return              Zero on success or a value from @ref errno.h on failure.
  */
-ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4)
+sysarg_t ipc_answer_fast(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         return __SYSCALL6(SYS_IPC_ANSWER_FAST, callid, retval, arg1, arg2, arg3,
@@ -412 +413 @@
  * @return              Zero on success or a value from @ref errno.h on failure.
  */
-ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5)
+sysarg_t ipc_answer_slow(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
 {
         ipc_call_t data;
@@ -585 +586 @@
  */
 int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3, 
-    ipcarg_t *phonehash)
+    sysarg_t *phonehash)
 {
         return ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2,
@@ -602 +603 @@
 int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3)
 {
-        ipcarg_t newphid;
+        sysarg_t newphid;
         int res;
 
@@ -626 +627 @@
 int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3)
 {
-        ipcarg_t newphid;
+        sysarg_t newphid;
         int res;
 
@@ -676 +677 @@
 /** Forward a received call to another destination.
  *
- * @param callid        Hash of the call to forward.
- * @param phoneid       Phone handle to use for forwarding.
- * @param method        New method for the forwarded call.
- * @param arg1          New value of the first argument for the forwarded call.
- * @param arg2          New value of the second argument for the forwarded call.
- * @param mode          Flags specifying mode of the forward operation.
- *
- * @return              Zero on success or an error code.
+ * @param callid  Hash of the call to forward.
+ * @param phoneid Phone handle to use for forwarding.
+ * @param imethod New interface and method for the forwarded call.
+ * @param arg1    New value of the first argument for the forwarded call.
+ * @param arg2    New value of the second argument for the forwarded call.
+ * @param mode    Flags specifying mode of the forward operation.
+ *
+ * @return Zero on success or an error code.
  *
  * For non-system methods, the old method, arg1 and arg2 are rewritten by the
@@ -690 +691 @@
  * methods are forwarded verbatim.
  */
-int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, ipcarg_t arg2, int mode)
-{
-        return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1, 
+int ipc_forward_fast(ipc_callid_t callid, int phoneid, int imethod,
+    sysarg_t arg1, sysarg_t arg2, int mode)
+{
+        return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, imethod, arg1,
             arg2, mode);
 }
 
 
-int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+int ipc_forward_slow(ipc_callid_t callid, int phoneid, int imethod,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
     int mode)
 {
         ipc_call_t data;
-
-        IPC_SET_METHOD(data, method);
+        
+        IPC_SET_IMETHOD(data, imethod);
         IPC_SET_ARG1(data, arg1);
         IPC_SET_ARG2(data, arg2);
@@ -710 +711 @@
         IPC_SET_ARG4(data, arg4);
         IPC_SET_ARG5(data, arg5);
-
+        
         return __SYSCALL4(SYS_IPC_FORWARD_SLOW, callid, phoneid, (sysarg_t) &data, mode);
 }
@@ -725 +726 @@
  * @return              Zero on success or a negative error code from errno.h.
  */
-int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
+int ipc_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
     int *flags)
 {
         sysarg_t tmp_flags = 0;
-        int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
-            (ipcarg_t) size, arg, NULL, &tmp_flags);
+        int res = ipc_call_sync_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
+            (sysarg_t) size, arg, NULL, &tmp_flags);
         
         if (flags)
@@ -751 +752 @@
 int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags)
 {
-        return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) flags);
+        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) flags);
 }
 
@@ -764 +765 @@
 int ipc_share_out_start(int phoneid, void *src, int flags)
 {
-        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
-            (ipcarg_t) flags);
+        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
+            (sysarg_t) flags);
 }
 
@@ -780 +781 @@
 int ipc_share_out_finalize(ipc_callid_t callid, void *dst)
 {
-        return ipc_answer_1(callid, EOK, (ipcarg_t) dst);
+        return ipc_answer_1(callid, EOK, (sysarg_t) dst);
 }
 
@@ -794 +795 @@
 int ipc_data_read_start(int phoneid, void *dst, size_t size)
 {
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
-            (ipcarg_t) size);
+        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
+            (sysarg_t) size);
 }
 
@@ -812 +813 @@
 int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
 {
-        return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
+        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) size);
 }
 
@@ -825 +826 @@
 int ipc_data_write_start(int phoneid, const void *src, size_t size)
 {
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
-            (ipcarg_t) size);
+        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
+            (sysarg_t) size);
 }
 
@@ -842 +843 @@
 int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
 {
-        return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
-}
-
-#include <kernel/syscall/sysarg64.h>
+        return ipc_answer_2(callid, EOK, (sysarg_t) dst, (sysarg_t) size);
+}
+
 /** Connect to a task specified by id.
+ *
  */
 int ipc_connect_kbox(task_id_t id)
 {
-        sysarg64_t arg;
-
-        arg.value = (unsigned long long) id;
-
+#ifdef __32_BITS__
+        sysarg64_t arg = (sysarg64_t) id;
         return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-}
- 
+#endif
+        
+#ifdef __64_BITS__
+        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id);
+#endif
+}
+
 /** @}
  */

uspace/lib/c/generic/loader.c

@@ -96 +96 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -131 +131 @@
         }
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -166 +166 @@
         free(pa);
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -213 +213 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -267 +267 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {

uspace/lib/c/generic/net/icmp_api.c

@@ -81 +81 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (addrlen <= 0)
@@ -87 +87 @@
 
         message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl,
-            tos, (ipcarg_t) dont_fragment, NULL);
+            tos, (sysarg_t) dont_fragment, NULL);
 
         // send the address

uspace/lib/c/generic/net/modules.c

@@ -67 +67 @@
                 switch (answer_count) {
                 case 0:
-                        ipc_answer_0(callid, (ipcarg_t) result);
+                        ipc_answer_0(callid, (sysarg_t) result);
                         break;
                 case 1:
-                        ipc_answer_1(callid, (ipcarg_t) result,
+                        ipc_answer_1(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer));
                         break;
                 case 2:
-                        ipc_answer_2(callid, (ipcarg_t) result,
+                        ipc_answer_2(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer));
                         break;
                 case 3:
-                        ipc_answer_3(callid, (ipcarg_t) result,
+                        ipc_answer_3(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer));
                         break;
                 case 4:
-                        ipc_answer_4(callid, (ipcarg_t) result,
+                        ipc_answer_4(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer));
@@ -89 +89 @@
                 case 5:
                 default:
-                        ipc_answer_5(callid, (ipcarg_t) result,
+                        ipc_answer_5(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer),
@@ -111 +111 @@
  *                      function.
  */
-int bind_service(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3,
+int bind_service(services_t need, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     async_client_conn_t client_receiver)
 {
@@ -134 +134 @@
  *
  */
-int bind_service_timeout(services_t need, ipcarg_t arg1, ipcarg_t arg2,
-    ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
+int bind_service_timeout(services_t need, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
         int rc;
@@ -143 +143 @@
         if (phone >= 0) {
                 /* Request the bidirectional connection */
-                ipcarg_t phonehash;
+                sysarg_t phonehash;
                 
                 rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
@@ -283 +283 @@
                 IPC_SET_RETVAL(*answer, 0);
                 // just to be precize
-                IPC_SET_METHOD(*answer, 0);
+                IPC_SET_IMETHOD(*answer, 0);
                 IPC_SET_ARG1(*answer, 0);
                 IPC_SET_ARG2(*answer, 0);

uspace/lib/c/generic/net/socket_client.c

@@ -214 +214 @@
         callid = async_get_call(&call);
 
-        switch (IPC_GET_METHOD(call)) {
+        switch (IPC_GET_IMETHOD(call)) {
         case NET_SOCKET_RECEIVED:
         case NET_SOCKET_ACCEPTED:
@@ -229 +229 @@
                 }
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case NET_SOCKET_RECEIVED:
                         fibril_mutex_lock(&socket->receive_lock);
@@ -278 +278 @@
         }
 
-        ipc_answer_0(callid, (ipcarg_t) rc);
+        ipc_answer_0(callid, (sysarg_t) rc);
         goto loop;
 }
@@ -404 +404 @@
         int socket_id;
         services_t service;
-        ipcarg_t fragment_size;
-        ipcarg_t header_size;
+        sysarg_t fragment_size;
+        sysarg_t header_size;
         int rc;
 
@@ -494 +494 @@
                 dyn_fifo_destroy(&socket->accepted);
                 free(socket);
-                async_msg_3(phone, NET_SOCKET_CLOSE, (ipcarg_t) socket_id, 0,
+                async_msg_3(phone, NET_SOCKET_CLOSE, (sysarg_t) socket_id, 0,
                     service);
                 return rc;
@@ -516 +516 @@
  */
 static int
-socket_send_data(int socket_id, ipcarg_t message, ipcarg_t arg2,
+socket_send_data(int socket_id, sysarg_t message, sysarg_t arg2,
     const void *data, size_t datalength)
 {
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (!data)
@@ -540 +540 @@
         // request the message
         message_id = async_send_3(socket->phone, message,
-            (ipcarg_t) socket->socket_id, arg2, socket->service, NULL);
+            (sysarg_t) socket->socket_id, arg2, socket->service, NULL);
         // send the address
         async_data_write_start(socket->phone, data, datalength);
@@ -600 +600 @@
         // request listen backlog change
         result = (int) async_req_3_0(socket->phone, NET_SOCKET_LISTEN,
-            (ipcarg_t) socket->socket_id, (ipcarg_t) backlog, socket->service);
+            (sysarg_t) socket->socket_id, (sysarg_t) backlog, socket->service);
 
         fibril_rwlock_read_unlock(&socket_globals.lock);
@@ -625 +625 @@
         socket_t *new_socket;
         aid_t message_id;
-        ipcarg_t ipc_result;
+        sysarg_t ipc_result;
         int result;
         ipc_call_t answer;
@@ -683 +683 @@
         // request accept
         message_id = async_send_5(socket->phone, NET_SOCKET_ACCEPT,
-            (ipcarg_t) socket->socket_id, 0, socket->service, 0,
+            (sysarg_t) socket->socket_id, 0, socket->service, 0,
             new_socket->socket_id, &answer);
 
@@ -782 +782 @@
         // request close
         rc = (int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
-            (ipcarg_t) socket->socket_id, 0, socket->service);
+            (sysarg_t) socket->socket_id, 0, socket->service);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&socket_globals.lock);
@@ -815 +815 @@
  */
 static int
-sendto_core(ipcarg_t message, int socket_id, const void *data,
+sendto_core(sysarg_t message, int socket_id, const void *data,
     size_t datalength, int flags, const struct sockaddr *toaddr,
     socklen_t addrlen)
@@ -821 +821 @@
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         size_t fragments;
         ipc_call_t answer;
@@ -855 +855 @@
         // request send
         message_id = async_send_5(socket->phone, message,
-            (ipcarg_t) socket->socket_id,
+            (sysarg_t) socket->socket_id,
             (fragments == 1 ? datalength : socket->data_fragment_size),
-            socket->service, (ipcarg_t) flags, fragments, &answer);
+            socket->service, (sysarg_t) flags, fragments, &answer);
 
         // send the address if given
@@ -973 +973 @@
  */
 static int
-recvfrom_core(ipcarg_t message, int socket_id, void *data, size_t datalength,
+recvfrom_core(sysarg_t message, int socket_id, void *data, size_t datalength,
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
 {
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t ipc_result;
+        sysarg_t ipc_result;
         int result;
         size_t fragments;
@@ -1031 +1031 @@
                 // request packet data
                 message_id = async_send_4(socket->phone, message,
-                    (ipcarg_t) socket->socket_id, 0, socket->service,
-                    (ipcarg_t) flags, &answer);
+                    (sysarg_t) socket->socket_id, 0, socket->service,
+                    (sysarg_t) flags, &answer);
 
                 // read the address if desired
@@ -1060 +1060 @@
                 // request packet data
                 message_id = async_send_4(socket->phone, message,
-                    (ipcarg_t) socket->socket_id, 0, socket->service,
-                    (ipcarg_t) flags, &answer);
+                    (sysarg_t) socket->socket_id, 0, socket->service,
+                    (sysarg_t) flags, &answer);
 
                 // read the address if desired
@@ -1160 +1160 @@
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (!value || !optlen)
@@ -1179 +1179 @@
         // request option value
         message_id = async_send_3(socket->phone, NET_SOCKET_GETSOCKOPT,
-            (ipcarg_t) socket->socket_id, (ipcarg_t) optname, socket->service,
+            (sysarg_t) socket->socket_id, (sysarg_t) optname, socket->service,
             NULL);
 
@@ -1214 +1214 @@
         // send the value
         return socket_send_data(socket_id, NET_SOCKET_SETSOCKOPT,
-            (ipcarg_t) optname, value, optlen);
+            (sysarg_t) optname, value, optlen);
 }
 

uspace/lib/c/generic/task.c

@@ -47 +47 @@
 task_id_t task_get_id(void)
 {
+#ifdef __32_BITS__
         task_id_t task_id;
         (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
         
         return task_id;
+#endif  /* __32_BITS__ */
+        
+#ifdef __64_BITS__
+        return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID);
+#endif  /* __64_BITS__ */
 }
 
@@ -211 +217 @@
 int task_wait(task_id_t id, task_exit_t *texit, int *retval)
 {
-        ipcarg_t te, rv;
+        sysarg_t te, rv;
         int rc;
 

uspace/lib/c/generic/udebug.c

@@ -57 +57 @@
         size_t *copied, size_t *needed)
 {
-        ipcarg_t a_copied, a_needed;
+        sysarg_t a_copied, a_needed;
         int rc;
 
@@ -72 +72 @@
         size_t *copied, size_t *needed)
 {
-        ipcarg_t a_copied, a_needed;
+        sysarg_t a_copied, a_needed;
         int rc;
 
@@ -87 +87 @@
         size_t *copied, size_t *needed)
 {
-        ipcarg_t a_copied, a_needed;
+        sysarg_t a_copied, a_needed;
         int rc;
 
@@ -120 +120 @@
     sysarg_t *val0, sysarg_t *val1)
 {
-        ipcarg_t a_ev_type;
+        sysarg_t a_ev_type;
         int rc;
 

uspace/lib/c/generic/vfs/vfs.c

@@ -158 +158 @@
         vfs_connect();
         
-        ipcarg_t rc_orig;
+        sysarg_t rc_orig;
         aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, devmap_handle, flags, NULL);
-        ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        sysarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
                 async_wait_for(req, &rc_orig);
@@ -238 +238 @@
 int unmount(const char *mp)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         size_t mpa_size;
@@ -282 +282 @@
         ipc_call_t answer;
         aid_t req = async_send_3(vfs_phone, VFS_IN_OPEN, lflag, oflag, 0, &answer);
-        ipcarg_t rc = async_data_write_start(vfs_phone, abs, abs_size);
-        
-        if (rc != EOK) {
-                ipcarg_t rc_orig;
+        sysarg_t rc = async_data_write_start(vfs_phone, abs, abs_size);
+        
+        if (rc != EOK) {
+                sysarg_t rc_orig;
                 async_wait_for(req, &rc_orig);
                 
@@ -330 +330 @@
             node->devmap_handle, node->index, oflag, &answer);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         async_serialize_end();
@@ -343 +343 @@
 int close(int fildes)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         
         futex_down(&vfs_phone_futex);
@@ -359 +359 @@
 ssize_t read(int fildes, void *buf, size_t nbyte) 
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         aid_t req;
@@ -370 +370 @@
         rc = async_data_read_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -391 +391 @@
 ssize_t write(int fildes, const void *buf, size_t nbyte) 
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         aid_t req;
@@ -402 +402 @@
         rc = async_data_write_start(vfs_phone, (void *)buf, nbyte);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -427 +427 @@
         vfs_connect();
         
-        ipcarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
+        sysarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
         
         async_serialize_end();
@@ -441 +441 @@
         vfs_connect();
         
-        ipcarg_t newoff_lo;
-        ipcarg_t newoff_hi;
-        ipcarg_t rc = async_req_4_2(vfs_phone, VFS_IN_SEEK, fildes,
+        sysarg_t newoff_lo;
+        sysarg_t newoff_hi;
+        sysarg_t rc = async_req_4_2(vfs_phone, VFS_IN_SEEK, fildes,
             LOWER32(offset), UPPER32(offset), whence,
             &newoff_lo, &newoff_hi);
@@ -458 +458 @@
 int ftruncate(int fildes, aoff64_t length)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         
         futex_down(&vfs_phone_futex);
@@ -474 +474 @@
 int fstat(int fildes, struct stat *stat)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
 
@@ -484 +484 @@
         rc = async_data_read_start(vfs_phone, (void *) stat, sizeof(struct stat));
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
                 
                 async_wait_for(req, &rc_orig);
@@ -503 +503 @@
 int stat(const char *path, struct stat *stat)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         
@@ -593 +593 @@
 int mkdir(const char *path, mode_t mode)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
         
@@ -608 +608 @@
         rc = async_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
         
                 async_wait_for(req, &rc_orig);
@@ -628 +628 @@
 static int _unlink(const char *path, int lflag)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         aid_t req;
         
@@ -643 +643 @@
         rc = async_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
-                ipcarg_t rc_orig;
+                sysarg_t rc_orig;
 
                 async_wait_for(req, &rc_orig);
@@ -673 +673 @@
 int rename(const char *old, const char *new)
 {
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
+        sysarg_t rc;
+        sysarg_t rc_orig;
         aid_t req;
         
@@ -810 +810 @@
         vfs_connect();
         
-        ipcarg_t ret;
-        ipcarg_t rc = async_req_2_1(vfs_phone, VFS_IN_DUP, oldfd, newfd, &ret);
+        sysarg_t ret;
+        sysarg_t rc = async_req_2_1(vfs_phone, VFS_IN_DUP, oldfd, newfd, &ret);
         
         async_serialize_end();

uspace/lib/c/include/async.h

@@ -84 +84 @@
             (arg5), (dataptr))
 
-extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
-extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+extern aid_t async_send_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr);
+extern aid_t async_send_slow(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
     ipc_call_t *dataptr);
-extern void async_wait_for(aid_t amsgid, ipcarg_t *result);
-extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
+extern void async_wait_for(aid_t amsgid, sysarg_t *result);
+extern int async_wait_timeout(aid_t amsgid, sysarg_t *retval,
     suseconds_t timeout);
 
-extern fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
+extern fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
     ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
 extern void async_usleep(suseconds_t timeout);
@@ -242 +242 @@
             (arg5), (rc1), (rc2), (rc3), (rc4), (rc5))
 
-extern ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
-    ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
-extern ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
-    ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5);
+extern sysarg_t async_req_fast(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
+    sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
+extern sysarg_t async_req_slow(int phoneid, sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
+    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5);
 
 static inline void async_serialize_start(void)
@@ -259 +259 @@
 }
 
-extern int async_connect_me_to(int, ipcarg_t, ipcarg_t, ipcarg_t);
-extern int async_connect_me_to_blocking(int, ipcarg_t, ipcarg_t, ipcarg_t);
+extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
+extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
 
 /*
@@ -274 +274 @@
         async_share_in_start((phoneid), (dst), (size), (arg), (flags))
 
-extern int async_share_in_start(int, void *, size_t, ipcarg_t, int *);
+extern int async_share_in_start(int, void *, size_t, sysarg_t, int *);
 extern int async_share_in_receive(ipc_callid_t *, size_t *);
 extern int async_share_in_finalize(ipc_callid_t, void *, int );
@@ -314 +314 @@
 extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
 
-extern int async_data_read_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipc_call_t *);
+extern int async_data_read_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, ipc_call_t *);
 
 /*
@@ -356 +356 @@
 extern void async_data_write_void(const int);
 
-extern int async_data_write_forward_fast(int, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipc_call_t *);
+extern int async_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, ipc_call_t *);
 
 #endif

uspace/lib/c/include/event.h

@@ -39 +39 @@
 #include <ipc/ipc.h>
 
-extern int event_subscribe(event_type_t, ipcarg_t);
+extern int event_subscribe(event_type_t, sysarg_t);
 
 #endif

uspace/lib/c/include/io/console.h

@@ -68 +68 @@
 extern void console_clear(int phone);
 
-extern int console_get_size(int phone, ipcarg_t *cols, ipcarg_t *rows);
-extern int console_get_pos(int phone, ipcarg_t *col, ipcarg_t *row);
-extern void console_set_pos(int phone, ipcarg_t col, ipcarg_t row);
+extern int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows);
+extern int console_get_pos(int phone, sysarg_t *col, sysarg_t *row);
+extern void console_set_pos(int phone, sysarg_t col, sysarg_t row);
 
 extern void console_set_style(int phone, uint8_t style);
@@ -78 +78 @@
 
 extern void console_cursor_visibility(int phone, bool show);
-extern int console_get_color_cap(int phone, ipcarg_t *ccap);
+extern int console_get_color_cap(int phone, sysarg_t *ccap);
 extern void console_kcon_enable(int phone);
 

uspace/lib/c/include/io/screenbuffer.h

@@ -84 +84 @@
         keyfield_t *buffer;      /**< Screen content - characters and
                                       their attributes (used as a circular buffer) */
-        ipcarg_t size_x;         /**< Number of columns  */
-        ipcarg_t size_y;         /**< Number of rows */
+        sysarg_t size_x;         /**< Number of columns  */
+        sysarg_t size_y;         /**< Number of rows */
         
         /** Coordinates of last printed character for determining cursor position */
-        ipcarg_t position_x;
-        ipcarg_t position_y;
+        sysarg_t position_x;
+        sysarg_t position_y;
         
         attrs_t attrs;           /**< Current attributes. */
@@ -109 +109 @@
  *
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y)
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
 {
         return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
@@ -143 +143 @@
 
 extern void screenbuffer_putchar(screenbuffer_t *, wchar_t);
-extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, ipcarg_t, ipcarg_t);
+extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, sysarg_t, sysarg_t);
 
 extern void screenbuffer_clear(screenbuffer_t *);
-extern void screenbuffer_clear_line(screenbuffer_t *, ipcarg_t);
+extern void screenbuffer_clear_line(screenbuffer_t *, sysarg_t);
 extern void screenbuffer_copy_buffer(screenbuffer_t *, keyfield_t *);
-extern void screenbuffer_goto(screenbuffer_t *, ipcarg_t, ipcarg_t);
+extern void screenbuffer_goto(screenbuffer_t *, sysarg_t, sysarg_t);
 extern void screenbuffer_set_style(screenbuffer_t *, uint8_t);
 extern void screenbuffer_set_color(screenbuffer_t *, uint8_t, uint8_t, uint8_t);

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

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

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

@@ -40 +40 @@
 #define DEVMAP_NAME_MAXLEN  255
 
-typedef ipcarg_t devmap_handle_t;
+typedef sysarg_t devmap_handle_t;
 
 typedef enum {

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

@@ -93 +93 @@
 #define IP_SET_HEADERLEN(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG2(*answer, argument); \
         } while (0)

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

@@ -44 +44 @@
 #define IPC_FLAG_BLOCKING  0x01
 
-typedef sysarg_t ipcarg_t;
-
 typedef struct {
-        ipcarg_t args[IPC_CALL_LEN];
-        ipcarg_t in_phone_hash;
+        sysarg_t args[IPC_CALL_LEN];
+        sysarg_t in_phone_hash;
 } ipc_call_t;
 
@@ -183 +181 @@
             (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
 
-extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
-
-extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
-    ipcarg_t *);
+extern int ipc_call_sync_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
+
+extern int ipc_call_sync_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
+    sysarg_t *);
 
 extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
@@ -220 +218 @@
         ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
 
-extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t);
-extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t);
+extern sysarg_t ipc_answer_fast(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
+extern sysarg_t ipc_answer_slow(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t);
 
 /*
@@ -255 +253 @@
             (arg4), (arg5), (private), (callback), (can_preempt))
 
-extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, void *, ipc_async_callback_t, int);
-extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
-
-extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
+extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, void *, ipc_async_callback_t, int);
+extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, void *, ipc_async_callback_t, int);
+
+extern int ipc_connect_to_me(int, int, int, int, sysarg_t *);
 extern int ipc_connect_me_to(int, int, int, int);
 extern int ipc_connect_me_to_blocking(int, int, int, int);
@@ -266 +264 @@
 extern int ipc_register_irq(int, int, int, irq_code_t *);
 extern int ipc_unregister_irq(int, int);
-extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
-extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t, int);
+extern int ipc_forward_fast(ipc_callid_t, int, int, sysarg_t, sysarg_t, int);
+extern int ipc_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, int);
 
 /*
@@ -282 +280 @@
         ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
 
-extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
+extern int ipc_share_in_start(int, void *, size_t, sysarg_t, int *);
 extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
 extern int ipc_share_out_start(int, void *, int);

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

@@ -192 +192 @@
  */
 #define IS_NET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_FIRST, NET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_FIRST, NET_LAST)
 
 /** Returns a value indicating whether the IPC call is an ARP message.
@@ -198 +198 @@
  */
 #define IS_NET_ARP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
 
 /** Returns a value indicating whether the IPC call is an Ethernet message.
@@ -204 +204 @@
  */
 #define IS_NET_ETH_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
 
 /** Returns a value indicating whether the IPC call is an ICMP message.
@@ -210 +210 @@
  */
 #define IS_NET_ICMP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
 
 /** Returns a value indicating whether the IPC call is an inter-network layer
@@ -217 +217 @@
  */
 #define IS_NET_IL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IL_FIRST, NET_IL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IL_FIRST, NET_IL_LAST)
 
 /** Returns a value indicating whether the IPC call is an IP message.
@@ -223 +223 @@
  */
 #define IS_NET_IP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IP_FIRST, NET_IP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IP_FIRST, NET_IP_LAST)
 
 /** Returns a value indicating whether the IPC call is a generic networking
@@ -230 +230 @@
  */
 #define IS_NET_NET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NET_FIRST, NET_NET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NET_FIRST, NET_NET_LAST)
 
 /** Returns a value indicating whether the IPC call is a network interface layer
@@ -237 +237 @@
  */
 #define IS_NET_NIL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
 
 /** Returns a value indicating whether the IPC call is a packet manaagement
@@ -244 +244 @@
  */
 #define IS_NET_PACKET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
 
 /** Returns a value indicating whether the IPC call is a socket message.
@@ -250 +250 @@
  */
 #define IS_NET_SOCKET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
 
 /** Returns a value indicating whether the IPC call is a TCP message.
@@ -256 +256 @@
  */
 #define IS_NET_TCP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
 
 /** Returns a value indicating whether the IPC call is a transport layer message.
@@ -262 +262 @@
  */
 #define IS_NET_TL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TL_FIRST, NET_TL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TL_FIRST, NET_TL_LAST)
 
 /** Returns a value indicating whether the IPC call is a UDP message.
@@ -268 +268 @@
  */
 #define IS_NET_UDP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
 
 /*@}*/
@@ -370 +370 @@
 #define IPC_SET_DEVICE(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(*answer, argument); \
         } while (0)
@@ -379 +379 @@
 #define IPC_SET_ADDR(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(*answer, argument); \
         } while (0)
@@ -388 +388 @@
 #define IPC_SET_PREFIX(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG2(*answer, argument); \
         } while (0)
@@ -397 +397 @@
 #define IPC_SET_CONTENT(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG3(*answer, argument); \
         } while (0)
@@ -406 +406 @@
 #define IPC_SET_SUFFIX(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG4(*answer, argument); \
         } while (0)

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

@@ -84 +84 @@
 #define SOCKET_SET_SOCKET_ID(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(answer, argument); \
         } while (0)
@@ -102 +102 @@
 #define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(answer, argument); \
         } while (0)
@@ -147 +147 @@
 #define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG2(answer, argument); \
         } while (0)
@@ -156 +156 @@
 #define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG3(answer, argument);\
         } while (0)
@@ -174 +174 @@
 #define SOCKET_SET_HEADER_SIZE(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG3(answer, argument); \
         } while (0)

uspace/lib/c/include/libc.h

@@ -40 +40 @@
 #include <libarch/syscall.h>
 
+#ifdef __32_BITS__
+
+/** Explicit 64-bit arguments passed to syscalls. */
+typedef uint64_t sysarg64_t;
+
+#endif /* __32_BITS__ */
+
 #define __SYSCALL0(id) \
         __syscall0(0, 0, 0, 0, 0, 0, id)
@@ -53 +60 @@
         __syscall5(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
-    __syscall6(p1, p2, p3, p4, p5, p6, id)
+        __syscall6(p1, p2, p3, p4, p5, p6, id)
 
 extern void __main(void *pcb_ptr);

uspace/lib/c/include/net/modules.h

@@ -74 +74 @@
 
 extern void answer_call(ipc_callid_t, int, ipc_call_t *, int);
-extern int bind_service(services_t, ipcarg_t, ipcarg_t, ipcarg_t,
+extern int bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
     async_client_conn_t);
-extern int bind_service_timeout(services_t, ipcarg_t, ipcarg_t, ipcarg_t,
+extern int bind_service_timeout(services_t, sysarg_t, sysarg_t, sysarg_t,
     async_client_conn_t, suseconds_t);
 extern int connect_to_service(services_t);