Index: uspace/lib/block/libblock.c =================================================================== --- uspace/lib/block/libblock.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/block/libblock.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/abs32le/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/amd64/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/arm32/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/ia32/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/ia64/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/mips32/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/ppc32/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/arch/sparc64/include/inttypes.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/async.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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. */ @@ -288,5 +288,5 @@ 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,5 +401,5 @@ */ 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,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 *)) { @@ -588,5 +588,5 @@ } - switch (IPC_GET_METHOD(*call)) { + switch (IPC_GET_IMETHOD(*call)) { case IPC_M_CONNECT_ME: case IPC_M_CONNECT_ME_TO: @@ -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; @@ -1199,5 +1199,5 @@ *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,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); } @@ -1259,5 +1259,5 @@ *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,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); } @@ -1317,5 +1317,5 @@ *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,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); } @@ -1412,5 +1412,5 @@ *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,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/cap.c =================================================================== --- uspace/lib/c/generic/cap.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/cap.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -31,6 +31,6 @@ */ /** - * @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,36 +38,43 @@ #include #include -#include /** 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 } Index: uspace/lib/c/generic/clipboard.c =================================================================== --- uspace/lib/c/generic/clipboard.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/clipboard.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/device/char.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/device/hw_res.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/devman.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/devmap.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/event.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/io/console.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/io/screenbuffer.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/ipc.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -38,5 +38,5 @@ */ /** @file - */ + */ #include @@ -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; @@ -131,29 +131,29 @@ /** 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,10 +161,10 @@ 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,5 +177,5 @@ if (result5) *result5 = IPC_GET_ARG5(data); - + return IPC_GET_RETVAL(data); } @@ -183,8 +183,9 @@ /** 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,23 +278,23 @@ * 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,5 +302,5 @@ return; } - + /* * We need to make sure that we get callid before another thread @@ -307,7 +308,7 @@ */ 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,5 +317,5 @@ 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,20 +338,20 @@ * 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,5 +363,5 @@ 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,6 +394,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 +413,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 +586,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 +603,5 @@ int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3) { - ipcarg_t newphid; + sysarg_t newphid; int res; @@ -626,5 +627,5 @@ int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3) { - ipcarg_t newphid; + sysarg_t newphid; int res; @@ -676,12 +677,12 @@ /** 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,19 +691,19 @@ * 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,5 +711,5 @@ IPC_SET_ARG4(data, arg4); IPC_SET_ARG5(data, arg5); - + return __SYSCALL4(SYS_IPC_FORWARD_SLOW, callid, phoneid, (sysarg_t) &data, mode); } @@ -725,10 +726,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 +752,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 +765,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 +781,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 +795,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 +813,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 +826,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,19 +843,22 @@ 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 + 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 +} + /** @} */ Index: uspace/lib/c/generic/loader.c =================================================================== --- uspace/lib/c/generic/loader.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/loader.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/net/icmp_api.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/net/modules.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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); @@ -283,5 +283,5 @@ 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); Index: uspace/lib/c/generic/net/socket_client.c =================================================================== --- uspace/lib/c/generic/net/socket_client.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/net/socket_client.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -214,5 +214,5 @@ callid = async_get_call(&call); - switch (IPC_GET_METHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case NET_SOCKET_RECEIVED: case NET_SOCKET_ACCEPTED: @@ -229,5 +229,5 @@ } - switch (IPC_GET_METHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case NET_SOCKET_RECEIVED: fibril_mutex_lock(&socket->receive_lock); @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/task.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -47,8 +47,14 @@ 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,5 +217,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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/udebug.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/generic/vfs/vfs.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/async.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/event.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/io/console.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/io/screenbuffer.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/devman.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/devmap.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/ip.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/ipc.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/net.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -192,5 +192,5 @@ */ #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,5 +198,5 @@ */ #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,5 +204,5 @@ */ #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,5 +210,5 @@ */ #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,5 +217,5 @@ */ #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,5 +223,5 @@ */ #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,5 +230,5 @@ */ #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,5 +237,5 @@ */ #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,5 +244,5 @@ */ #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,5 +250,5 @@ */ #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,5 +256,5 @@ */ #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,5 +262,5 @@ */ #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,5 +268,5 @@ */ #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,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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/ipc/socket.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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/libc.h =================================================================== --- uspace/lib/c/include/libc.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/libc.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -40,4 +40,11 @@ #include +#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,5 +60,5 @@ __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); Index: uspace/lib/c/include/net/modules.h =================================================================== --- uspace/lib/c/include/net/modules.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/c/include/net/modules.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/clui/tinput.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/clui/tinput.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/drv/generic/dev_iface.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -56,5 +56,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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/drv/generic/driver.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -81,5 +81,5 @@ static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall) { - int id = (int)IPC_GET_METHOD(*icall); + int id = (int)IPC_GET_IMETHOD(*icall); interrupt_context_t *ctx; @@ -200,5 +200,5 @@ ipc_callid_t callid = async_get_call(&call); - switch (IPC_GET_METHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case IPC_M_PHONE_HUNGUP: cont = false; @@ -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_IMETHOD(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/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/drv/generic/remote_usbhc.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -122,5 +122,5 @@ ipc_callid_t callid, ipc_call_t *call) { - ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call); + sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call); async_transaction_t * trans = (async_transaction_t *)buffer_hash; if (trans == NULL) { @@ -197,5 +197,5 @@ ipc_answer_0(callid, rc); } else { - ipc_answer_1(callid, EOK, (ipcarg_t) address); + ipc_answer_1(callid, EOK, (sysarg_t) address); } } @@ -254,5 +254,5 @@ // FIXME - answer according to outcome - ipc_answer_1(trans->caller, EOK, (ipcarg_t)trans); + ipc_answer_1(trans->caller, EOK, (sysarg_t)trans); trans->size = actual_size; Index: uspace/lib/drv/include/driver.h =================================================================== --- uspace/lib/drv/include/driver.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/drv/include/driver.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/fs/libfs.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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; @@ -163,5 +163,5 @@ callid = async_get_call(&call); int mountee_phone = (int) IPC_GET_ARG1(call); - if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) || + if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) || (mountee_phone < 0)) { ipc_answer_0(callid, EINVAL); Index: uspace/lib/fs/libfs.h =================================================================== --- uspace/lib/fs/libfs.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/fs/libfs.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/generic/generic.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/generic/packet_remote.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/il/arp_remote.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/il/ip_remote.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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_local.c =================================================================== --- uspace/lib/net/netif/netif_local.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/netif/netif_local.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -366,5 +366,5 @@ *answer_count = 0; - switch (IPC_GET_METHOD(*call)) { + switch (IPC_GET_IMETHOD(*call)) { case IPC_M_PHONE_HUNGUP: return EOK; Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/netif/netif_remote.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/net/tl/icmp_remote.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -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 cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/packet/generic/packet_server.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -327,5 +327,5 @@ *answer_count = 0; - switch (IPC_GET_METHOD(*call)) { + switch (IPC_GET_IMETHOD(*call)) { case IPC_M_PHONE_HUNGUP: return EOK; @@ -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; Index: uspace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ (revision ) @@ -1,71 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Host - network byte order manipulation functions. - */ - -#ifndef __NET_BYTEORDER_H__ -#define __NET_BYTEORDER_H__ - -#include -#include - - -/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htons(number) host2uint16_t_be(number) - -/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htonl(number) host2uint32_t_be(number) - -/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohs(number) uint16_t_be2host(number) - -/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohl(number) uint32_t_be2host(number) - -#endif - -/** @} - */ Index: uspace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Common error processing codes and routines. - */ - -#ifndef __NET_ERR_H__ -#define __NET_ERR_H__ - -#include - -#ifdef CONFIG_DEBUG - #include - #include -#endif - -/** An actual stored error code. - * - */ -#define ERROR_CODE error_check_return_value - -/** An error processing routines declaration. - * - * This has to be declared in the block where the error processing - * is desired. - * - */ -#define ERROR_DECLARE int ERROR_CODE - -/** Store the value as an error code and checks if an error occurred. - * - * @param[in] value The value to be checked. May be a function call. - * @return False if the value indicates success (EOK). - * @return True otherwise. - * - */ -#ifdef CONFIG_DEBUG - -#define ERROR_OCCURRED(value) \ - (((ERROR_CODE = (value)) != EOK) \ - && ({ \ - fprintf(stderr, "libsocket error at %s:%d (%s)\n", \ - __FILE__, __LINE__, str_error(ERROR_CODE)); \ - 1; \ - })) - -#else - -#define ERROR_OCCURRED(value) ((ERROR_CODE = (value)) != EOK) - -#endif - -/** Error propagation - * - * Check if an error occurred and immediately exit the actual - * function returning the error code. - * - * @param[in] value The value to be checked. May be a function call. - * - */ - -#define ERROR_PROPAGATE(value) \ - if (ERROR_OCCURRED(value)) \ - return ERROR_CODE - -#endif - -/** @} - */ Index: uspace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ (revision ) @@ -1,136 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Socket error codes. - * Based on BSD. - */ - -#ifndef __NET_SOCKET_ERR_H__ -#define __NET_SOCKET_ERR_H__ - -#include - -/** @name Socket error codes definitions - */ -/*@{*/ - -////#define EINTR (-10004) -////#define EBADF (-10009) -//#define EACCES (-10013) -//#define EFAULT (-10014) -////#define EINVAL (-10022) -////#define EMFILE (-10024) -//#define EWOULDBLOCK (-10035) - -/** An API function is called while another blocking function is in progress. - */ -#define EINPROGRESS (-10036) - -//#define EALREADY (-10037) - -/** The socket identifier is not valid. - */ -#define ENOTSOCK (-10038) - -/** The destination address required. - */ -#define EDESTADDRREQ (-10039) - -//#define EMSGSIZE (-10040) -//#define EPROTOTYPE (-10041) -//#define ENOPROTOOPT (-10042) - -/** Protocol is not supported. - */ -#define EPROTONOSUPPORT (-10043) - -/** Socket type is not supported. - */ -#define ESOCKTNOSUPPORT (-10044) - -//#define EOPNOTSUPP (-10045) - -/** Protocol family is not supported. - */ -#define EPFNOSUPPORT (-10046) - -/** Address family is not supported. - */ -#define EAFNOSUPPORT (-10047) - -/** Address is already in use. - */ -#define EADDRINUSE (-10048) - -//#define EADDRNOTAVAIL (-10049) -/* May be reported at any time if the implementation detects an underlying failure. - */ -//#define ENETDOWN (-10050) -//#define ENETUNREACH (-10051) -//#define ENETRESET (-10052) -//#define ECONNABORTED (-10053) -//#define ECONNRESET (-10054) -//#define ENOBUFS (-10055) -//#define EISCONN (-10056) - -/** The socket is not connected or bound. - */ -#define ENOTCONN (-10057) - -//#define ESHUTDOWN (-10058) -//#define ETOOMANYREFS (-10059) -//#define ETIMEDOUT (-10060) -//#define ECONNREFUSED (-10061) -//#define ELOOP (-10062) -////#define ENAMETOOLONG (-10063) -//#define EHOSTDOWN (-10064) -//#define EHOSTUNREACH (-10065) -//#define HOST_NOT_FOUND (-11001) - -/** The requested operation was not performed. - * Try again later. - */ -#define TRY_AGAIN (-11002) - -//#define NO_RECOVERY (-11003) - -/** No data. - */ -#define NO_DATA (-11004) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/usb/include/usb/usb.h =================================================================== --- uspace/lib/usb/include/usb/usb.h (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/usb/include/usb/usb.h (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -101,5 +101,5 @@ * Used by various USB functions as opaque handle. */ -typedef ipcarg_t usb_handle_t; +typedef sysarg_t usb_handle_t; /** USB packet identifier. */ Index: uspace/lib/usb/src/usbdrv.c =================================================================== --- uspace/lib/usb/src/usbdrv.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/usb/src/usbdrv.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -90,5 +90,5 @@ usb_address_t usb_drv_get_my_address(int phone, device_t *dev) { - ipcarg_t address; + sysarg_t address; int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_GET_ADDRESS, @@ -132,5 +132,5 @@ usb_address_t usb_drv_request_address(int phone) { - ipcarg_t address; + sysarg_t address; int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_REQUEST_ADDRESS, &address); @@ -298,9 +298,9 @@ * @return Error status. */ -static int read_buffer_in(int phone, ipcarg_t hash, +static int read_buffer_in(int phone, sysarg_t hash, void *buffer, size_t size, size_t *actual_size) { ipc_call_t answer_data; - ipcarg_t answer_rc; + sysarg_t answer_rc; aid_t req; int rc; @@ -350,5 +350,5 @@ transfer_info_t *transfer = (transfer_info_t *) handle; - ipcarg_t answer_rc; + sysarg_t answer_rc; async_wait_for(transfer->request, &answer_rc); @@ -367,5 +367,5 @@ * We will use it when actually reading-in the data. */ - ipcarg_t buffer_hash = IPC_GET_ARG1(transfer->reply); + sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply); if (buffer_hash == 0) { rc = ENOENT; Index: uspace/lib/usbvirt/src/callback.c =================================================================== --- uspace/lib/usbvirt/src/callback.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/usbvirt/src/callback.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -201,5 +201,5 @@ callid = async_get_call(&call); - switch (IPC_GET_METHOD(call)) { + switch (IPC_GET_IMETHOD(call)) { case IPC_M_PHONE_HUNGUP: ipc_answer_0(callid, EOK); Index: uspace/lib/usbvirt/src/main.c =================================================================== --- uspace/lib/usbvirt/src/main.c (revision cea3fca1b5fe5acf120cd2cfce8a7be20ef69281) +++ uspace/lib/usbvirt/src/main.c (revision 6e5dc07f868b16c838c79bc42117b6116010e91b) @@ -50,5 +50,5 @@ int vhcd_phone; /** Device id. */ - ipcarg_t id; + sysarg_t id; /** Linked-list member. */ link_t link; @@ -78,5 +78,5 @@ /** Find virtual device wrapper by its id. */ -static virtual_device_t *find_device_by_id(ipcarg_t id) +static virtual_device_t *find_device_by_id(sysarg_t id) { if (list_empty(&device_list)) { @@ -220,5 +220,5 @@ } - ipcarg_t phonehash; + sysarg_t phonehash; rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &phonehash); if (rc != EOK) {