Index: uspace/lib/block/libblock.c =================================================================== --- uspace/lib/block/libblock.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/block/libblock.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -862,5 +862,5 @@ static int get_block_size(int dev_phone, size_t *bsize) { - ipcarg_t bs; + sysarg_t bs; int rc; @@ -875,5 +875,5 @@ static int get_num_blocks(int dev_phone, aoff64_t *nblocks) { - ipcarg_t nb_l, nb_h; + sysarg_t nb_l, nb_h; int rc; Index: uspace/lib/c/arch/abs32le/include/inttypes.h =================================================================== --- uspace/lib/c/arch/abs32le/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/abs32le/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/amd64/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/arm32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/arm32/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/arm32/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/ia32/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/ia64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia64/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/ia64/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/mips32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/mips32/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/ppc32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ppc32/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/ppc32/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/arch/sparc64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/sparc64/include/inttypes.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/arch/sparc64/include/inttypes.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -34,7 +34,7 @@ #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. */ Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/async.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -120,5 +120,5 @@ ipc_call_t *dataptr; - ipcarg_t retval; + sysarg_t retval; } amsg_t; @@ -140,5 +140,5 @@ /** Incoming phone hash. */ - ipcarg_t in_phone_hash; + sysarg_t in_phone_hash; /** Messages that should be delivered to this fibril. */ @@ -529,5 +529,5 @@ * */ -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 *)) { @@ -807,6 +807,6 @@ * */ -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,6 +846,6 @@ * */ -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,5 +875,5 @@ * */ -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,5 +911,5 @@ * */ -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,7 +1023,7 @@ * */ -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,5 +1031,5 @@ &result); - ipcarg_t rc; + sysarg_t rc; async_wait_for(eid, &rc); @@ -1072,7 +1072,7 @@ * */ -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,5 +1080,5 @@ &result); - ipcarg_t rc; + sysarg_t rc; async_wait_for(eid, &rc); @@ -1113,8 +1113,8 @@ */ 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,9 +1140,9 @@ */ 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,11 +1166,11 @@ * @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; @@ -1231,6 +1231,6 @@ 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); } @@ -1292,6 +1292,6 @@ 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); } @@ -1345,6 +1345,6 @@ * */ -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,5 +1369,5 @@ } - ipcarg_t rc; + sysarg_t rc; async_wait_for(msg, &rc); @@ -1386,6 +1386,6 @@ 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); } @@ -1531,6 +1531,6 @@ * */ -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,5 +1555,5 @@ } - ipcarg_t rc; + sysarg_t rc; async_wait_for(msg, &rc); Index: uspace/lib/c/generic/clipboard.c =================================================================== --- uspace/lib/c/generic/clipboard.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/clipboard.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -75,5 +75,5 @@ 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,7 +85,7 @@ 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,7 +119,7 @@ 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,5 +158,5 @@ if (rc != EOK) { - ipcarg_t rc_orig; + sysarg_t rc_orig; async_wait_for(req, &rc_orig); async_serialize_end(); Index: uspace/lib/c/generic/device/char.c =================================================================== --- uspace/lib/c/generic/device/char.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/device/char.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -76,5 +76,5 @@ } - ipcarg_t rc; + sysarg_t rc; if (ret != EOK) { async_wait_for(req, &rc); Index: uspace/lib/c/generic/device/hw_res.c =================================================================== --- uspace/lib/c/generic/device/hw_res.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/device/hw_res.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -40,5 +40,5 @@ 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; Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/devman.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -95,5 +95,5 @@ 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,5 +104,5 @@ 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,5 +155,5 @@ 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,5 +192,5 @@ 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,5 +268,5 @@ &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); Index: uspace/lib/c/generic/devmap.c =================================================================== --- uspace/lib/c/generic/devmap.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/devmap.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -107,5 +107,5 @@ 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,5 +116,5 @@ 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,5 +145,5 @@ &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,5 +181,5 @@ &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,5 +217,5 @@ &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,5 +247,5 @@ return phone; - ipcarg_t type; + sysarg_t type; int retval = async_req_1_1(phone, DEVMAP_HANDLE_PROBE, handle, &type); if (retval != EOK) @@ -277,5 +277,5 @@ 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,10 +292,10 @@ 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,5 +307,5 @@ 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,5 +375,5 @@ } - ipcarg_t retval; + sysarg_t retval; async_wait_for(req, &retval); async_serialize_end(); @@ -427,5 +427,5 @@ } - ipcarg_t retval; + sysarg_t retval; async_wait_for(req, &retval); async_serialize_end(); Index: uspace/lib/c/generic/event.c =================================================================== --- uspace/lib/c/generic/event.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/event.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -49,5 +49,5 @@ * @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); Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/io/console.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -45,5 +45,5 @@ } -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,5 +71,5 @@ } -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,10 +81,10 @@ } -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,8 +93,8 @@ 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); Index: uspace/lib/c/generic/io/screenbuffer.c =================================================================== --- uspace/lib/c/generic/io/screenbuffer.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/io/screenbuffer.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -67,6 +67,6 @@ * */ -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,7 +110,7 @@ * */ -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,5 +141,5 @@ * */ -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; Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/ipc.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -104,7 +104,7 @@ */ 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; @@ -148,7 +148,7 @@ */ 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 method, 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; @@ -289,6 +289,6 @@ * 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, +void ipc_call_async_fast(int phoneid, sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, void *private, ipc_async_callback_t callback, int can_preempt) { @@ -351,6 +351,6 @@ * */ -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, +void ipc_call_async_slow(int phoneid, sysarg_t method, 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) { @@ -393,6 +393,6 @@ * @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,6 +412,6 @@ * @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,5 +585,5 @@ */ 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,5 +602,5 @@ int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3) { - ipcarg_t newphid; + sysarg_t newphid; int res; @@ -626,5 +626,5 @@ int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3) { - ipcarg_t newphid; + sysarg_t newphid; int res; @@ -691,5 +691,5 @@ */ int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method, - ipcarg_t arg1, ipcarg_t arg2, int mode) + sysarg_t arg1, sysarg_t arg2, int mode) { return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1, @@ -699,5 +699,5 @@ 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, + sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, int mode) { @@ -725,10 +725,10 @@ * @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,5 +751,5 @@ 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,6 +764,6 @@ 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,5 +780,5 @@ 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,6 +794,6 @@ 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,5 +812,5 @@ 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,6 +825,6 @@ 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,5 +842,5 @@ 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); + return ipc_answer_2(callid, EOK, (sysarg_t) dst, (sysarg_t) size); } Index: uspace/lib/c/generic/loader.c =================================================================== --- uspace/lib/c/generic/loader.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/loader.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -96,5 +96,5 @@ } - ipcarg_t retval; + sysarg_t retval; async_wait_for(req, &retval); return (int) retval; @@ -131,5 +131,5 @@ } - ipcarg_t retval; + sysarg_t retval; async_wait_for(req, &retval); return (int) retval; @@ -166,5 +166,5 @@ free(pa); - ipcarg_t retval; + sysarg_t retval; async_wait_for(req, &retval); return (int) retval; @@ -213,5 +213,5 @@ 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,5 +267,5 @@ 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) { Index: uspace/lib/c/generic/net/icmp_api.c =================================================================== --- uspace/lib/c/generic/net/icmp_api.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/net/icmp_api.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -81,5 +81,5 @@ { aid_t message_id; - ipcarg_t result; + sysarg_t result; if (addrlen <= 0) @@ -87,5 +87,5 @@ 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 Index: uspace/lib/c/generic/net/modules.c =================================================================== --- uspace/lib/c/generic/net/modules.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/net/modules.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -67,21 +67,21 @@ 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,5 +89,5 @@ 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,5 +111,5 @@ * 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,6 +134,6 @@ * */ -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,5 +143,5 @@ if (phone >= 0) { /* Request the bidirectional connection */ - ipcarg_t phonehash; + sysarg_t phonehash; rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash); Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/net/socket_client.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -278,5 +278,5 @@ } - ipc_answer_0(callid, (ipcarg_t) rc); + ipc_answer_0(callid, (sysarg_t) rc); goto loop; } @@ -404,6 +404,6 @@ 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,5 +494,5 @@ 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,10 +516,10 @@ */ 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,5 +540,5 @@ // 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,5 +600,5 @@ // 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,5 +625,5 @@ socket_t *new_socket; aid_t message_id; - ipcarg_t ipc_result; + sysarg_t ipc_result; int result; ipc_call_t answer; @@ -683,5 +683,5 @@ // 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,5 +782,5 @@ // 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,5 +815,5 @@ */ 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,5 +821,5 @@ socket_t *socket; aid_t message_id; - ipcarg_t result; + sysarg_t result; size_t fragments; ipc_call_t answer; @@ -855,7 +855,7 @@ // 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,10 +973,10 @@ */ 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,6 +1031,6 @@ // 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,6 +1060,6 @@ // 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,5 +1160,5 @@ socket_t *socket; aid_t message_id; - ipcarg_t result; + sysarg_t result; if (!value || !optlen) @@ -1179,5 +1179,5 @@ // 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,5 +1214,5 @@ // send the value return socket_send_data(socket_id, NET_SOCKET_SETSOCKOPT, - (ipcarg_t) optname, value, optlen); + (sysarg_t) optname, value, optlen); } Index: uspace/lib/c/generic/task.c =================================================================== --- uspace/lib/c/generic/task.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/task.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -211,5 +211,5 @@ int task_wait(task_id_t id, task_exit_t *texit, int *retval) { - ipcarg_t te, rv; + sysarg_t te, rv; int rc; Index: uspace/lib/c/generic/udebug.c =================================================================== --- uspace/lib/c/generic/udebug.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/udebug.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -57,5 +57,5 @@ size_t *copied, size_t *needed) { - ipcarg_t a_copied, a_needed; + sysarg_t a_copied, a_needed; int rc; @@ -72,5 +72,5 @@ size_t *copied, size_t *needed) { - ipcarg_t a_copied, a_needed; + sysarg_t a_copied, a_needed; int rc; @@ -87,5 +87,5 @@ size_t *copied, size_t *needed) { - ipcarg_t a_copied, a_needed; + sysarg_t a_copied, a_needed; int rc; @@ -120,5 +120,5 @@ sysarg_t *val0, sysarg_t *val1) { - ipcarg_t a_ev_type; + sysarg_t a_ev_type; int rc; Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/generic/vfs/vfs.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -158,7 +158,7 @@ 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,6 +238,6 @@ 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,8 +282,8 @@ 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,5 +330,5 @@ node->devmap_handle, node->index, oflag, &answer); - ipcarg_t rc; + sysarg_t rc; async_wait_for(req, &rc); async_serialize_end(); @@ -343,5 +343,5 @@ int close(int fildes) { - ipcarg_t rc; + sysarg_t rc; futex_down(&vfs_phone_futex); @@ -359,5 +359,5 @@ ssize_t read(int fildes, void *buf, size_t nbyte) { - ipcarg_t rc; + sysarg_t rc; ipc_call_t answer; aid_t req; @@ -370,5 +370,5 @@ 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,5 +391,5 @@ 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,5 +402,5 @@ 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,5 +427,5 @@ 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,7 +441,7 @@ 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,5 +458,5 @@ int ftruncate(int fildes, aoff64_t length) { - ipcarg_t rc; + sysarg_t rc; futex_down(&vfs_phone_futex); @@ -474,5 +474,5 @@ int fstat(int fildes, struct stat *stat) { - ipcarg_t rc; + sysarg_t rc; aid_t req; @@ -484,5 +484,5 @@ 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,6 +503,6 @@ 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,5 +593,5 @@ int mkdir(const char *path, mode_t mode) { - ipcarg_t rc; + sysarg_t rc; aid_t req; @@ -608,5 +608,5 @@ 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,5 +628,5 @@ static int _unlink(const char *path, int lflag) { - ipcarg_t rc; + sysarg_t rc; aid_t req; @@ -643,5 +643,5 @@ 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,6 +673,6 @@ 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,6 +810,6 @@ 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(); Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/async.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -84,14 +84,14 @@ (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,10 +242,10 @@ (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,6 +259,6 @@ } -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,5 +274,5 @@ 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,6 +314,6 @@ 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,6 +356,6 @@ 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 Index: uspace/lib/c/include/event.h =================================================================== --- uspace/lib/c/include/event.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/event.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -39,5 +39,5 @@ #include -extern int event_subscribe(event_type_t, ipcarg_t); +extern int event_subscribe(event_type_t, sysarg_t); #endif Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/io/console.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -68,7 +68,7 @@ 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,5 +78,5 @@ 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); Index: uspace/lib/c/include/io/screenbuffer.h =================================================================== --- uspace/lib/c/include/io/screenbuffer.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/io/screenbuffer.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -84,10 +84,10 @@ 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,5 +109,5 @@ * */ -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,10 +143,10 @@ 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); Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/devman.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -42,5 +42,5 @@ #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. Index: uspace/lib/c/include/ipc/devmap.h =================================================================== --- uspace/lib/c/include/ipc/devmap.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/devmap.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -40,5 +40,5 @@ #define DEVMAP_NAME_MAXLEN 255 -typedef ipcarg_t devmap_handle_t; +typedef sysarg_t devmap_handle_t; typedef enum { Index: uspace/lib/c/include/ipc/ip.h =================================================================== --- uspace/lib/c/include/ipc/ip.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/ip.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -93,5 +93,5 @@ #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) Index: uspace/lib/c/include/ipc/ipc.h =================================================================== --- uspace/lib/c/include/ipc/ipc.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/ipc.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -44,9 +44,7 @@ #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,10 +181,10 @@ (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,8 +218,8 @@ 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,10 +253,10 @@ (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,7 +264,7 @@ 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,5 +280,5 @@ 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); Index: uspace/lib/c/include/ipc/net.h =================================================================== --- uspace/lib/c/include/ipc/net.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/net.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -370,5 +370,5 @@ #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,5 +379,5 @@ #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,5 +388,5 @@ #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,5 +397,5 @@ #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,5 +406,5 @@ #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) Index: uspace/lib/c/include/ipc/socket.h =================================================================== --- uspace/lib/c/include/ipc/socket.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/ipc/socket.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -84,5 +84,5 @@ #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,5 +102,5 @@ #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,5 +147,5 @@ #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,5 +156,5 @@ #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,5 +174,5 @@ #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) Index: uspace/lib/c/include/net/modules.h =================================================================== --- uspace/lib/c/include/net/modules.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/c/include/net/modules.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -74,7 +74,7 @@ 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); Index: uspace/lib/clui/tinput.c =================================================================== --- uspace/lib/clui/tinput.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/clui/tinput.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -140,6 +140,6 @@ static void tinput_update_origin(tinput_t *ti) { - ipcarg_t width = ti->col0 + ti->nc; - ipcarg_t rows = (width / ti->con_cols) + 1; + sysarg_t width = ti->col0 + ti->nc; + sysarg_t rows = (width / ti->con_cols) + 1; /* Update row0 if the screen scrolled. */ @@ -153,8 +153,8 @@ return; - ipcarg_t new_width = ti->col0 + ti->nc + 1; + sysarg_t new_width = ti->col0 + ti->nc + 1; if (new_width % ti->con_cols == 0) { /* Advancing to new line. */ - ipcarg_t new_height = (new_width / ti->con_cols) + 1; + sysarg_t new_height = (new_width / ti->con_cols) + 1; if (new_height >= ti->con_rows) { /* Disallow text longer than 1 page for now. */ @@ -184,6 +184,6 @@ return; - ipcarg_t new_width = ti->col0 + ti->nc + ilen; - ipcarg_t new_height = (new_width / ti->con_cols) + 1; + sysarg_t new_width = ti->col0 + ti->nc + ilen; + sysarg_t new_height = (new_width / ti->con_cols) + 1; if (new_height >= ti->con_rows) { /* Disallow text longer than 1 page for now. */ Index: uspace/lib/clui/tinput.h =================================================================== --- uspace/lib/clui/tinput.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/clui/tinput.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -51,10 +51,10 @@ /** Screen coordinates of the top-left corner of the text field */ - ipcarg_t col0; - ipcarg_t row0; + sysarg_t col0; + sysarg_t row0; /** Screen dimensions */ - ipcarg_t con_cols; - ipcarg_t con_rows; + sysarg_t con_cols; + sysarg_t con_rows; /** Number of characters in @c buffer */ Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/drv/generic/dev_iface.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -54,5 +54,5 @@ remote_iface_func_ptr_t -get_remote_method(remote_iface_t *rem_iface, ipcarg_t iface_method_idx) +get_remote_method(remote_iface_t *rem_iface, sysarg_t iface_method_idx) { if (iface_method_idx >= rem_iface->method_count) { Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/drv/generic/driver.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -254,5 +254,5 @@ ipc_call_t call; callid = async_get_call(&call); - ipcarg_t method = IPC_GET_METHOD(call); + sysarg_t method = IPC_GET_METHOD(call); int iface_idx; @@ -308,5 +308,5 @@ /* get the method of the remote interface */ - ipcarg_t iface_method_idx = IPC_GET_ARG1(call); + sysarg_t iface_method_idx = IPC_GET_ARG1(call); remote_iface_func_ptr_t iface_method_ptr = get_remote_method(rem_iface, iface_method_idx); @@ -346,5 +346,5 @@ { /* Select interface */ - switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) { + switch ((sysarg_t) (IPC_GET_ARG1(*icall))) { case DRIVER_DEVMAN: /* handle PnP events from device manager */ Index: uspace/lib/drv/include/driver.h =================================================================== --- uspace/lib/drv/include/driver.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/drv/include/driver.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -79,5 +79,5 @@ remote_iface_t *get_remote_iface(int); -remote_iface_func_ptr_t get_remote_method(remote_iface_t *, ipcarg_t); +remote_iface_func_ptr_t get_remote_method(remote_iface_t *, sysarg_t); Index: uspace/lib/fs/libfs.c =================================================================== --- uspace/lib/fs/libfs.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/fs/libfs.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -155,5 +155,5 @@ devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request); int res; - ipcarg_t rc; + sysarg_t rc; ipc_call_t call; Index: uspace/lib/fs/libfs.h =================================================================== --- uspace/lib/fs/libfs.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/fs/libfs.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -86,5 +86,5 @@ typedef struct { int fs_handle; /**< File system handle. */ - ipcarg_t vfs_phonehash; /**< Initial VFS phonehash. */ + sysarg_t vfs_phonehash; /**< Initial VFS phonehash. */ uint8_t *plb_ro; /**< Read-only PLB view. */ } fs_reg_t; Index: uspace/lib/net/generic/generic.c =================================================================== --- uspace/lib/net/generic/generic.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/generic/generic.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -59,6 +59,6 @@ int state, services_t target) { - async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id, - (ipcarg_t) state, target); + async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + (sysarg_t) state, target); return EOK; @@ -81,6 +81,6 @@ int arg2, services_t service) { - return (int) async_req_3_0(phone, (ipcarg_t) message, - (ipcarg_t) device_id, (ipcarg_t) arg2, (ipcarg_t) service); + return (int) async_req_3_0(phone, (sysarg_t) message, + (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service); } @@ -103,5 +103,5 @@ { aid_t message_id; - ipcarg_t result; + sysarg_t result; int string; @@ -110,6 +110,6 @@ // request the address - message_id = async_send_1(phone, (ipcarg_t) message, - (ipcarg_t) device_id, NULL); + message_id = async_send_1(phone, (sysarg_t) message, + (sysarg_t) device_id, NULL); string = measured_strings_return(phone, address, data, 1); async_wait_for(message_id, &result); @@ -143,11 +143,11 @@ return EBADMEM; - ipcarg_t addr_len; - ipcarg_t prefix; - ipcarg_t content; - ipcarg_t suffix; - - ipcarg_t result = async_req_1_4(phone, (ipcarg_t) message, - (ipcarg_t) device_id, &addr_len, &prefix, &content, &suffix); + sysarg_t addr_len; + sysarg_t prefix; + sysarg_t content; + sysarg_t suffix; + + sysarg_t result = async_req_1_4(phone, (sysarg_t) message, + (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix); packet_dimension->prefix = (size_t) prefix; @@ -175,9 +175,9 @@ { if (error) { - async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id, - (ipcarg_t) packet_id, (ipcarg_t) target, (ipcarg_t) error); + async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error); } else { - async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id, - (ipcarg_t) packet_id, (ipcarg_t) target); + async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + (sysarg_t) packet_id, (sysarg_t) target); } @@ -201,9 +201,9 @@ { if (error) { - async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id, - (ipcarg_t) packet_id, (ipcarg_t) sender, (ipcarg_t) error); + async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error); } else { - async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id, - (ipcarg_t) packet_id, (ipcarg_t) sender); + async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + (sysarg_t) packet_id, (sysarg_t) sender); } @@ -237,5 +237,5 @@ { aid_t message_id; - ipcarg_t result; + sysarg_t result; int string; @@ -246,6 +246,6 @@ // request the translation - message_id = async_send_3(phone, (ipcarg_t) message, - (ipcarg_t) device_id, (ipcarg_t) count, (ipcarg_t) service, NULL); + message_id = async_send_3(phone, (sysarg_t) message, + (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL); measured_strings_send(phone, configuration, count); string = measured_strings_return(phone, translation, data, count); Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/generic/packet_remote.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -86,5 +86,5 @@ } - ipcarg_t result; + sysarg_t result; async_wait_for(message, &result); @@ -116,5 +116,5 @@ *packet = pm_find(packet_id); if (!*packet) { - ipcarg_t size; + sysarg_t size; rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, @@ -151,6 +151,6 @@ size_t max_prefix, size_t max_suffix) { - ipcarg_t packet_id; - ipcarg_t size; + sysarg_t packet_id; + sysarg_t size; int rc; @@ -182,6 +182,6 @@ packet_t *packet_get_1_remote(int phone, size_t content) { - ipcarg_t packet_id; - ipcarg_t size; + sysarg_t packet_id; + sysarg_t size; int rc; Index: uspace/lib/net/il/arp_remote.c =================================================================== --- uspace/lib/net/il/arp_remote.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/il/arp_remote.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -86,8 +86,8 @@ { aid_t message_id; - ipcarg_t result; + sysarg_t result; message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS, - (ipcarg_t) device_id, protocol, NULL); + (sysarg_t) device_id, protocol, NULL); measured_strings_send(arp_phone, address, 1); async_wait_for(message_id, &result); @@ -106,5 +106,5 @@ { return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, - (ipcarg_t) device_id); + (sysarg_t) device_id); } @@ -136,8 +136,8 @@ { aid_t message_id; - ipcarg_t result; + sysarg_t result; message_id = async_send_3(arp_phone, NET_ARP_DEVICE, - (ipcarg_t) device_id, protocol, netif, NULL); + (sysarg_t) device_id, protocol, netif, NULL); measured_strings_send(arp_phone, address, 1); async_wait_for(message_id, &result); Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/il/ip_remote.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -67,6 +67,6 @@ { return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE, - (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr, - (ipcarg_t) address.s_addr, (ipcarg_t) netmask.s_addr); + (sysarg_t) device_id, (sysarg_t) gateway.s_addr, + (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr); } @@ -86,5 +86,5 @@ async_client_conn_t receiver) { - return (int) bind_service(service, (ipcarg_t) protocol, me, service, + return (int) bind_service(service, (sysarg_t) protocol, me, service, receiver); } @@ -151,5 +151,5 @@ ipc_call_t answer; aid_t message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE, - (ipcarg_t) protocol, &answer); + (sysarg_t) protocol, &answer); if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) && @@ -164,5 +164,5 @@ } - ipcarg_t result; + sysarg_t result; async_wait_for(message_id, &result); @@ -244,5 +244,5 @@ { return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY, - (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr); + (sysarg_t) device_id, (sysarg_t) gateway.s_addr); } Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/netif/netif_remote.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -144,8 +144,8 @@ aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS, - (ipcarg_t) device_id, NULL); + (sysarg_t) device_id, NULL); async_data_read_start(netif_phone, stats, sizeof(*stats)); - ipcarg_t result; + sysarg_t result; async_wait_for(message_id, &result); Index: uspace/lib/net/tl/icmp_remote.c =================================================================== --- uspace/lib/net/tl/icmp_remote.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/net/tl/icmp_remote.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -65,6 +65,6 @@ icmp_param_t mtu, packet_t *packet) { - async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (ipcarg_t) code, - (ipcarg_t) packet_get_id(packet), (ipcarg_t) mtu); + async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code, + (sysarg_t) packet_get_id(packet), (sysarg_t) mtu); return EOK; } @@ -85,5 +85,5 @@ { async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0, - (ipcarg_t) packet_get_id(packet)); + (sysarg_t) packet_get_id(packet)); return EOK; } @@ -104,6 +104,6 @@ int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet) { - async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (ipcarg_t) code, - (ipcarg_t) packet_get_id(packet)); + async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code, + (sysarg_t) packet_get_id(packet)); return EOK; } @@ -126,6 +126,6 @@ icmp_param_t pointer, packet_t *packet) { - async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (ipcarg_t) code, - (ipcarg_t) packet_get_id(packet), (ipcarg_t) pointer); + async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code, + (sysarg_t) packet_get_id(packet), (sysarg_t) pointer); return EOK; } Index: uspace/lib/packet/generic/packet_server.c =================================================================== --- uspace/lib/packet/generic/packet_server.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/lib/packet/generic/packet_server.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) @@ -337,6 +337,6 @@ return ENOMEM; *answer_count = 2; - IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id); - IPC_SET_ARG2(*answer, (ipcarg_t) packet->length); + IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); + IPC_SET_ARG2(*answer, (sysarg_t) packet->length); return EOK; @@ -351,6 +351,6 @@ return ENOMEM; *answer_count = 2; - IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id); - IPC_SET_ARG2(*answer, (ipcarg_t) packet->length); + IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); + IPC_SET_ARG2(*answer, (sysarg_t) packet->length); return EOK; @@ -365,5 +365,5 @@ if (!packet_is_valid(packet)) return ENOENT; - IPC_SET_ARG1(*answer, (ipcarg_t) packet->length); + IPC_SET_ARG1(*answer, (sysarg_t) packet->length); *answer_count = 1; return EOK;