Index: uspace/app/trace/ipcp.c =================================================================== --- uspace/app/trace/ipcp.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/app/trace/ipcp.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -250,5 +250,5 @@ sysarg_t method; sysarg_t service; - sysarg_t retval; + int retval; proto_t *proto; int cphone; @@ -265,5 +265,5 @@ if ((display_mask & DM_IPC) != 0) { - printf("Response to %d: retval=%" PRIdn ", args = (%" PRIun ", " + printf("Response to %d: retval=%d, args = (%" PRIun ", " "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n", hash, retval, IPC_GET_ARG1(*answer), Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/app/trace/trace.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -260,5 +260,5 @@ -static void print_sc_retval(sysarg_t retval, val_type_t val_type) +static void print_sc_retval(int retval, val_type_t val_type) { printf(" -> "); @@ -279,10 +279,10 @@ } -static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc) +static void sc_ipc_call_async_fast(sysarg_t *sc_args, int sc_rc) { ipc_call_t call; sysarg_t phoneid; - if (sc_rc != (sysarg_t) EOK) + if (sc_rc != EOK) return; Index: uspace/drv/bus/usb/vhc/conndev.c =================================================================== --- uspace/drv/bus/usb/vhc/conndev.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/drv/bus/usb/vhc/conndev.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -75,6 +75,6 @@ } - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); Index: uspace/lib/c/arch/ia32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -48,5 +48,5 @@ #define __syscall6 __syscall_slow -extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t, +extern int (* __syscall_fast_func)(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/async.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -205,5 +205,5 @@ ipc_call_t *dataptr; - sysarg_t retval; + int retval; } amsg_t; @@ -332,5 +332,5 @@ msg->destroyed = false; msg->dataptr = NULL; - msg->retval = (sysarg_t) EINVAL; + msg->retval = EINVAL; awaiter_initialize(&msg->wdata); } @@ -860,5 +860,5 @@ &answer); - sysarg_t ret; + int ret; async_wait_for(req, &ret); if (ret != EOK) @@ -1708,5 +1708,5 @@ * */ -void async_wait_for(aid_t amsgid, sysarg_t *retval) +void async_wait_for(aid_t amsgid, int *retval) { assert(amsgid); @@ -1754,5 +1754,5 @@ * */ -int async_wait_timeout(aid_t amsgid, sysarg_t *retval, suseconds_t timeout) +int async_wait_timeout(aid_t amsgid, int *retval, suseconds_t timeout) { assert(amsgid); @@ -1917,5 +1917,5 @@ * */ -sysarg_t async_req_fast(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, +int async_req_fast(async_exch_t *exch, sysarg_t imethod, 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) @@ -1928,5 +1928,5 @@ &result); - sysarg_t rc; + int rc; async_wait_for(aid, &rc); @@ -1969,5 +1969,5 @@ * */ -sysarg_t async_req_slow(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, +int async_req_slow(async_exch_t *exch, sysarg_t imethod, 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) @@ -1980,5 +1980,5 @@ &result); - sysarg_t rc; + int rc; async_wait_for(aid, &rc); @@ -2044,15 +2044,15 @@ } -sysarg_t async_answer_0(cap_handle_t chandle, sysarg_t retval) +int async_answer_0(cap_handle_t chandle, int retval) { return ipc_answer_0(chandle, retval); } -sysarg_t async_answer_1(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1) +int async_answer_1(cap_handle_t chandle, int retval, sysarg_t arg1) { return ipc_answer_1(chandle, retval, arg1); } -sysarg_t async_answer_2(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int async_answer_2(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2) { @@ -2060,5 +2060,5 @@ } -sysarg_t async_answer_3(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int async_answer_3(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3) { @@ -2066,5 +2066,5 @@ } -sysarg_t async_answer_4(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int async_answer_4(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4) { @@ -2072,5 +2072,5 @@ } -sysarg_t async_answer_5(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int async_answer_5(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5) { @@ -2120,5 +2120,5 @@ &answer); - sysarg_t rc; + int rc; async_wait_for(req, &rc); if (rc != EOK) @@ -2147,5 +2147,5 @@ msg, reply_received); - sysarg_t rc; + int rc; async_wait_for((aid_t) msg, &rc); @@ -2886,5 +2886,5 @@ } - sysarg_t rc; + int rc; async_wait_for(msg, &rc); @@ -3064,5 +3064,5 @@ * */ -void async_data_write_void(sysarg_t retval) +void async_data_write_void(int retval) { cap_handle_t chandle; @@ -3102,5 +3102,5 @@ } - sysarg_t rc; + int rc; async_wait_for(msg, &rc); Index: uspace/lib/c/generic/bd.c =================================================================== --- uspace/lib/c/generic/bd.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/bd.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -98,5 +98,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -121,5 +121,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -146,5 +146,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) Index: uspace/lib/c/generic/clipboard.c =================================================================== --- uspace/lib/c/generic/clipboard.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/clipboard.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -104,5 +104,5 @@ if (size == 0) { async_exch_t *exch = clip_exchange_begin(); - sysarg_t rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA, + int rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE); clip_exchange_end(exch); @@ -113,9 +113,9 @@ aid_t req = async_send_1(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, NULL); - sysarg_t rc = async_data_write_start(exch, (void *) str, size); + int rc = async_data_write_start(exch, (void *) str, size); clip_exchange_end(exch); if (rc != EOK) { - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); if (rc_orig == EOK) @@ -148,5 +148,5 @@ sysarg_t size; sysarg_t tag; - sysarg_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag); + int rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag); clip_exchange_end(exch); @@ -185,5 +185,5 @@ if (rc != EOK) { - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); if (rc_orig == EOK) Index: uspace/lib/c/generic/device/clock_dev.c =================================================================== --- uspace/lib/c/generic/device/clock_dev.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/device/clock_dev.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -60,5 +60,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; if (ret != EOK) { async_forget(req); @@ -91,5 +91,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; if (ret != EOK) { async_forget(req); Index: uspace/lib/c/generic/device/led_dev.c =================================================================== --- uspace/lib/c/generic/device/led_dev.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/device/led_dev.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -48,5 +48,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; async_wait_for(req, &rc); Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/devman.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -182,5 +182,5 @@ ipc_call_t answer; aid_t req = async_send_2(exch, DEVMAN_DRIVER_REGISTER, 0, 0, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); devman_exchange_end(exch); @@ -222,5 +222,5 @@ aid_t req = async_send_3(exch, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype, devh, match_count, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); if (retval != EOK) { devman_exchange_end(exch); @@ -272,5 +272,5 @@ aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CATEGORY, devman_handle, &answer); - sysarg_t retval = async_data_write_start(exch, cat_name, + int retval = async_data_write_start(exch, cat_name, str_size(cat_name)); @@ -310,5 +310,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER); @@ -316,5 +316,5 @@ devman_exchange_end(exch); - return (int) retval; + return retval; } @@ -325,8 +325,8 @@ return ENOMEM; - sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh); - - devman_exchange_end(exch); - return (int) retval; + int retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh); + + devman_exchange_end(exch); + return retval; } @@ -337,8 +337,8 @@ return ENOMEM; - sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh); - - devman_exchange_end(exch); - return (int) retval; + int retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh); + + devman_exchange_end(exch); + return retval; } @@ -374,5 +374,5 @@ aid_t req = async_send_2(exch, DEVMAN_DEVICE_GET_HANDLE, flags, 0, &answer); - sysarg_t retval = async_data_write_start(exch, pathname, + int retval = async_data_write_start(exch, pathname, str_size(pathname)); @@ -405,5 +405,5 @@ ipc_call_t dreply; size_t act_size; - sysarg_t dretval; + int dretval; exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT); @@ -421,5 +421,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -476,8 +476,8 @@ return ENOMEM; - sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh); - - devman_exchange_end(exch); - return (int) retval; + int retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh); + + devman_exchange_end(exch); + return retval; } @@ -488,8 +488,8 @@ return ENOMEM; - sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh); - - devman_exchange_end(exch); - return (int) retval; + int retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh); + + devman_exchange_end(exch); + return retval; } @@ -510,5 +510,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -580,9 +580,9 @@ return ENOMEM; - sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_GET_CHILD, + int retval = async_req_1_1(exch, DEVMAN_FUN_GET_CHILD, funh, devh); devman_exchange_end(exch); - return (int) retval; + return retval; } @@ -600,9 +600,9 @@ return ENOMEM; - sysarg_t retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT, + int retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT, devh, funh); devman_exchange_end(exch); - return (int) retval; + return retval; } @@ -613,9 +613,9 @@ return ENOMEM; - sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE, + int retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE, sid, handle); devman_exchange_end(exch); - return (int) retval; + return retval; } @@ -643,5 +643,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer); - sysarg_t retval = async_data_write_start(exch, drvname, + int retval = async_data_write_start(exch, drvname, str_size(drvname)); Index: uspace/lib/c/generic/dnsr.c =================================================================== --- uspace/lib/c/generic/dnsr.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/dnsr.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -90,5 +90,5 @@ sizeof(inet_addr_t), &answer_addr); - sysarg_t retval_addr; + int retval_addr; async_wait_for(req_addr, &retval_addr); @@ -97,5 +97,5 @@ async_forget(req); free(info); - return (int) retval_addr; + return retval_addr; } @@ -107,5 +107,5 @@ dnsr_exchange_end(exch); - sysarg_t retval_cname; + int retval_cname; async_wait_for(req_cname, &retval_cname); @@ -113,8 +113,8 @@ async_forget(req); free(info); - return (int) retval_cname; + return retval_cname; } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -122,5 +122,5 @@ async_forget(req); free(info); - return (int) retval; + return retval; } @@ -165,8 +165,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } @@ -186,8 +186,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } Index: uspace/lib/c/generic/inet.c =================================================================== --- uspace/lib/c/generic/inet.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/inet.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -58,5 +58,5 @@ return rc; - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -141,8 +141,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } @@ -170,8 +170,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } Index: uspace/lib/c/generic/inet/tcp.c =================================================================== --- uspace/lib/c/generic/inet/tcp.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/inet/tcp.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -76,5 +76,5 @@ return rc; - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -216,10 +216,10 @@ exch = async_exchange_begin(tcp->sess); aid_t req = async_send_0(exch, TCP_CONN_CREATE, &answer); - sysarg_t rc = async_data_write_start(exch, (void *)epp, + int rc = async_data_write_start(exch, (void *)epp, sizeof(inet_ep2_t)); async_exchange_end(exch); if (rc != EOK) { - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); if (rc_orig != EOK) @@ -260,5 +260,5 @@ exch = async_exchange_begin(conn->tcp->sess); - sysarg_t rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id); + int rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id); async_exchange_end(exch); @@ -331,10 +331,10 @@ exch = async_exchange_begin(tcp->sess); aid_t req = async_send_0(exch, TCP_LISTENER_CREATE, &answer); - sysarg_t rc = async_data_write_start(exch, (void *)ep, + int rc = async_data_write_start(exch, (void *)ep, sizeof(inet_ep_t)); async_exchange_end(exch); if (rc != EOK) { - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); if (rc_orig != EOK) @@ -377,5 +377,5 @@ exch = async_exchange_begin(lst->tcp->sess); - sysarg_t rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id); + int rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id); async_exchange_end(exch); @@ -451,5 +451,5 @@ { async_exch_t *exch; - sysarg_t rc; + int rc; exch = async_exchange_begin(conn->tcp->sess); @@ -485,5 +485,5 @@ exch = async_exchange_begin(conn->tcp->sess); - sysarg_t rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id); + int rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id); async_exchange_end(exch); @@ -501,5 +501,5 @@ exch = async_exchange_begin(conn->tcp->sess); - sysarg_t rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id); + int rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id); async_exchange_end(exch); @@ -517,5 +517,5 @@ exch = async_exchange_begin(conn->tcp->sess); - sysarg_t rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id); + int rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id); async_exchange_end(exch); @@ -562,5 +562,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) { @@ -616,5 +616,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) { Index: uspace/lib/c/generic/inet/udp.c =================================================================== --- uspace/lib/c/generic/inet/udp.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/inet/udp.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -63,5 +63,5 @@ return rc; - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -173,10 +173,10 @@ exch = async_exchange_begin(udp->sess); aid_t req = async_send_0(exch, UDP_ASSOC_CREATE, &answer); - sysarg_t rc = async_data_write_start(exch, (void *)epp, + int rc = async_data_write_start(exch, (void *)epp, sizeof(inet_ep2_t)); async_exchange_end(exch); if (rc != EOK) { - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); if (rc_orig != EOK) @@ -220,5 +220,5 @@ exch = async_exchange_begin(assoc->udp->sess); - sysarg_t rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id); + int rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id); async_exchange_end(exch); @@ -237,5 +237,5 @@ exch = async_exchange_begin(assoc->udp->sess); - sysarg_t rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id); + int rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id); async_exchange_end(exch); @@ -260,5 +260,5 @@ aid_t req = async_send_1(exch, UDP_ASSOC_SEND_MSG, assoc->id, NULL); - sysarg_t rc = async_data_write_start(exch, (void *)dest, + int rc = async_data_write_start(exch, (void *)dest, sizeof(inet_ep_t)); if (rc != EOK) { @@ -333,5 +333,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) { @@ -398,5 +398,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) @@ -420,5 +420,5 @@ exch = async_exchange_begin(udp->sess); - sysarg_t rc = async_req_0_0(exch, UDP_RMSG_DISCARD); + int rc = async_req_0_0(exch, UDP_RMSG_DISCARD); async_exchange_end(exch); Index: uspace/lib/c/generic/inetcfg.c =================================================================== --- uspace/lib/c/generic/inetcfg.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/inetcfg.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -55,5 +55,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -158,10 +158,10 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); *addr_id = IPC_GET_ARG1(answer); - return (int) retval; + return retval; } @@ -187,5 +187,5 @@ sizeof(inet_naddr_t), &answer_naddr); - sysarg_t retval_naddr; + int retval_naddr; async_wait_for(req_naddr, &retval_naddr); @@ -193,5 +193,5 @@ async_exchange_end(exch); async_forget(req); - return (int) retval_naddr; + return retval_naddr; } @@ -203,17 +203,17 @@ async_exchange_end(exch); - sysarg_t retval_name; + int retval_name; async_wait_for(req_name, &retval_name); if (retval_name != EOK) { async_forget(req); - return (int) retval_name; - } - - sysarg_t retval; + return retval_name; + } + + int retval; async_wait_for(req, &retval); if (retval != EOK) - return (int) retval; + return retval; size_t act_size = IPC_GET_ARG2(answer_name); @@ -234,5 +234,5 @@ ipc_call_t answer; aid_t req = async_send_1(exch, INETCFG_ADDR_GET_ID, link_id, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); async_exchange_end(exch); @@ -280,5 +280,5 @@ { ipc_call_t dreply; - sysarg_t dretval; + int dretval; size_t act_size; char name_buf[LOC_NAME_MAXLEN + 1]; @@ -299,5 +299,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -356,10 +356,10 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); *sroute_id = IPC_GET_ARG1(answer); - return (int) retval; + return retval; } @@ -385,5 +385,5 @@ sizeof(inet_naddr_t), &answer_dest); - sysarg_t retval_dest; + int retval_dest; async_wait_for(req_dest, &retval_dest); @@ -391,5 +391,5 @@ async_exchange_end(exch); async_forget(req); - return (int) retval_dest; + return retval_dest; } @@ -398,5 +398,5 @@ sizeof(inet_addr_t), &answer_router); - sysarg_t retval_router; + int retval_router; async_wait_for(req_router, &retval_router); @@ -404,5 +404,5 @@ async_exchange_end(exch); async_forget(req); - return (int) retval_router; + return retval_router; } @@ -414,17 +414,17 @@ async_exchange_end(exch); - sysarg_t retval_name; + int retval_name; async_wait_for(req_name, &retval_name); if (retval_name != EOK) { async_forget(req); - return (int) retval_name; - } - - sysarg_t retval; + return retval_name; + } + + int retval; async_wait_for(req, &retval); if (retval != EOK) - return (int) retval; + return retval; size_t act_size = IPC_GET_ARG2(answer_name); @@ -444,5 +444,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, INETCFG_SROUTE_GET_ID, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); async_exchange_end(exch); Index: uspace/lib/c/generic/inetping.c =================================================================== --- uspace/lib/c/generic/inetping.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/inetping.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -110,8 +110,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } @@ -136,16 +136,16 @@ async_exchange_end(exch); - sysarg_t retval_local; + int retval_local; async_wait_for(req_local, &retval_local); if (retval_local != EOK) { async_forget(req); - return (int) retval_local; - } - - sysarg_t retval; + return retval_local; + } + + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } Index: uspace/lib/c/generic/io/chardev.c =================================================================== --- uspace/lib/c/generic/io/chardev.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/chardev.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -114,5 +114,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -166,5 +166,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) { Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/console.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -188,5 +188,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; async_wait_for(aid, &rc); @@ -202,5 +202,5 @@ } } else { - sysarg_t retval; + int retval; async_wait_for(ctrl->input_aid, &retval); @@ -208,5 +208,5 @@ if (retval != EOK) { - errno = (int) retval; + errno = retval; return false; } @@ -235,5 +235,5 @@ } - sysarg_t retval; + int retval; int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout); if (rc != EOK) { @@ -246,5 +246,5 @@ if (retval != EOK) { - errno = (int) retval; + errno = retval; return false; } Index: uspace/lib/c/generic/io/log.c =================================================================== --- uspace/lib/c/generic/io/log.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/log.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -89,5 +89,5 @@ log, level, NULL); int rc = async_data_write_start(exchange, message, str_size(message)); - sysarg_t reg_msg_rc; + int reg_msg_rc; async_wait_for(reg_msg, ®_msg_rc); @@ -199,5 +199,5 @@ parent, &answer); int rc = async_data_write_start(exchange, name, str_size(name)); - sysarg_t reg_msg_rc; + int reg_msg_rc; async_wait_for(reg_msg, ®_msg_rc); Index: uspace/lib/c/generic/io/logctl.c =================================================================== --- uspace/lib/c/generic/io/logctl.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/logctl.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -111,5 +111,5 @@ new_level, NULL); rc = async_data_write_start(exchange, logname, str_size(logname)); - sysarg_t reg_msg_rc; + int reg_msg_rc; async_wait_for(reg_msg, ®_msg_rc); @@ -137,5 +137,5 @@ rc = vfs_pass_handle(vfs_exch, vfs_root(), exchange); vfs_exchange_end(vfs_exch); - sysarg_t reg_msg_rc; + int reg_msg_rc; async_wait_for(reg_msg, ®_msg_rc); Index: uspace/lib/c/generic/io/output.c =================================================================== --- uspace/lib/c/generic/io/output.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/output.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -94,5 +94,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); Index: uspace/lib/c/generic/io/visualizer.c =================================================================== --- uspace/lib/c/generic/io/visualizer.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/visualizer.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -68,5 +68,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); @@ -91,5 +91,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); @@ -114,5 +114,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); @@ -137,5 +137,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); @@ -160,5 +160,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); Index: uspace/lib/c/generic/io/window.c =================================================================== --- uspace/lib/c/generic/io/window.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/io/window.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -61,5 +61,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); @@ -105,5 +105,5 @@ async_exchange_end(exch); - sysarg_t ret; + int ret; async_wait_for(req, &ret); Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/ipc.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -197,5 +197,5 @@ * */ -sysarg_t ipc_answer_fast(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int ipc_answer_fast(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4) { @@ -218,5 +218,5 @@ * */ -sysarg_t ipc_answer_slow(cap_handle_t chandle, sysarg_t retval, sysarg_t arg1, +int ipc_answer_slow(cap_handle_t chandle, int retval, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5) { Index: uspace/lib/c/generic/iplink.c =================================================================== --- uspace/lib/c/generic/iplink.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/iplink.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -102,8 +102,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } @@ -131,8 +131,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } @@ -169,8 +169,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } @@ -191,8 +191,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } @@ -213,8 +213,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } @@ -234,8 +234,8 @@ } - sysarg_t retval; - async_wait_for(req, &retval); - - return (int) retval; + int retval; + async_wait_for(req, &retval); + + return retval; } Index: uspace/lib/c/generic/iplink_srv.c =================================================================== --- uspace/lib/c/generic/iplink_srv.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/iplink_srv.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -78,5 +78,5 @@ async_answer_0(callid, rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -90,6 +90,6 @@ if (!async_data_write_receive(&callid, &size)) { - async_answer_0(callid, (sysarg_t) EREFUSED); - async_answer_0(iid, (sysarg_t) EREFUSED); + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); } @@ -104,5 +104,5 @@ async_answer_0(callid, rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -127,10 +127,10 @@ int rc = async_data_write_finalize(callid, &addr, size); if (rc != EOK) { - async_answer_0(callid, (sysarg_t) rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(callid, rc); + async_answer_0(iid, rc); } rc = srv->ops->addr_add(srv, &addr); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -155,10 +155,10 @@ int rc = async_data_write_finalize(callid, &addr, size); if (rc != EOK) { - async_answer_0(callid, (sysarg_t) rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(callid, rc); + async_answer_0(iid, rc); } rc = srv->ops->addr_remove(srv, &addr); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -204,6 +204,6 @@ int rc = async_data_write_finalize(callid, &sdu.dest, size); if (rc != EOK) { - async_answer_0(callid, (sysarg_t) rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(callid, rc); + async_answer_0(iid, rc); } @@ -321,5 +321,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) @@ -347,5 +347,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) Index: uspace/lib/c/generic/loader.c =================================================================== --- uspace/lib/c/generic/loader.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/loader.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -94,5 +94,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_GET_TASKID, &answer); - sysarg_t rc = async_data_read_start(exch, task_id, sizeof(task_id_t)); + int rc = async_data_read_start(exch, task_id, sizeof(task_id_t)); async_exchange_end(exch); @@ -131,5 +131,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_SET_CWD, &answer); - sysarg_t rc = async_data_write_start(exch, cwd, len); + int rc = async_data_write_start(exch, cwd, len); async_exchange_end(exch); @@ -161,5 +161,5 @@ aid_t req = async_send_0(exch, LOADER_SET_PROGRAM, &answer); - sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1); + int rc = async_data_write_start(exch, name, str_size(name) + 1); if (rc == EOK) { async_exch_t *vfs_exch = vfs_exchange_begin(); @@ -252,5 +252,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, LOADER_SET_ARGS, &answer); - sysarg_t rc = async_data_write_start(exch, (void *) arg_buf, + int rc = async_data_write_start(exch, (void *) arg_buf, buffer_size); @@ -283,5 +283,5 @@ aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL); - sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1); + int rc = async_data_write_start(exch, name, str_size(name) + 1); if (rc == EOK) { rc = vfs_pass_handle(vfs_exch, file, exch); Index: uspace/lib/c/generic/loc.c =================================================================== --- uspace/lib/c/generic/loc.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/loc.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -121,5 +121,5 @@ return rc; - sysarg_t retval; + int retval; async_wait_for(req, &retval); if (retval != EOK) @@ -245,5 +245,5 @@ ipc_call_t answer; aid_t req = async_send_2(exch, LOC_SERVER_REGISTER, 0, 0, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); if (retval != EOK) { @@ -278,5 +278,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, LOC_SERVICE_REGISTER, &answer); - sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); + int retval = async_data_write_start(exch, fqsn, str_size(fqsn)); if (retval != EOK) { @@ -314,5 +314,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); @@ -339,5 +339,5 @@ aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0, &answer); - sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); + int retval = async_data_write_start(exch, fqdn, str_size(fqdn)); loc_exchange_end(exch); @@ -379,5 +379,5 @@ ipc_call_t dreply; size_t act_size; - sysarg_t dretval; + int dretval; *name = NULL; @@ -397,5 +397,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -472,5 +472,5 @@ aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); loc_exchange_end(exch); @@ -521,5 +521,5 @@ aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + int retval = async_data_write_start(exch, name, str_size(name)); loc_exchange_end(exch); @@ -615,5 +615,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; exch = loc_exchange_begin_blocking(INTERFACE_LOC_SUPPLIER); @@ -692,5 +692,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -741,5 +741,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -768,5 +768,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); Index: uspace/lib/c/generic/ns.c =================================================================== --- uspace/lib/c/generic/ns.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/ns.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -48,5 +48,5 @@ int service_register(service_t service) { - sysarg_t retval; + int retval; ipc_call_t answer; Index: uspace/lib/c/generic/task.c =================================================================== --- uspace/lib/c/generic/task.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/task.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -369,5 +369,5 @@ assert(retval); - sysarg_t rc; + int rc; async_wait_for(wait->aid, &rc); Index: uspace/lib/c/generic/vbd.c =================================================================== --- uspace/lib/c/generic/vbd.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/vbd.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -106,5 +106,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; @@ -183,5 +183,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -259,5 +259,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; @@ -283,5 +283,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; @@ -338,5 +338,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/vfs/vfs.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -375,5 +375,5 @@ vfs_fs_probe_info_t *info) { - sysarg_t rc; + int rc; ipc_call_t answer; @@ -616,5 +616,5 @@ unsigned int flags, unsigned int instance, int *mountedfd) { - sysarg_t rc, rc1; + int rc, rc1; if (!mountedfd) @@ -810,5 +810,5 @@ sysarg_t ret; - sysarg_t rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE, high, &ret); + int rc = async_req_1_1(vfs_exch, VFS_IN_WAIT_HANDLE, high, &ret); async_exchange_end(vfs_exch); @@ -879,5 +879,5 @@ ssize_t *nread) { - sysarg_t rc; + int rc; ipc_call_t answer; aid_t req; @@ -920,6 +920,6 @@ int vfs_rename_path(const char *old, const char *new) { - sysarg_t rc; - sysarg_t rc_orig; + int rc; + int rc_orig; aid_t req; @@ -1051,5 +1051,5 @@ int vfs_stat(int file, struct stat *stat) { - sysarg_t rc; + int rc; aid_t req; @@ -1061,5 +1061,5 @@ vfs_exchange_end(exch); - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); @@ -1106,5 +1106,5 @@ int vfs_statfs(int file, struct statfs *st) { - sysarg_t rc, ret; + int rc, ret; aid_t req; @@ -1173,5 +1173,5 @@ int vfs_unlink(int parent, const char *child, int expect) { - sysarg_t rc; + int rc; aid_t req; @@ -1183,5 +1183,5 @@ vfs_exchange_end(exch); - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); @@ -1270,8 +1270,8 @@ ipc_call_t answer; aid_t req = async_send_2(exch, VFS_IN_WALK, parent, flags, &answer); - sysarg_t rc = async_data_write_start(exch, path, str_size(path)); + int rc = async_data_write_start(exch, path, str_size(path)); vfs_exchange_end(exch); - sysarg_t rc_orig; + int rc_orig; async_wait_for(req, &rc_orig); @@ -1343,5 +1343,5 @@ ssize_t *nwritten) { - sysarg_t rc; + int rc; ipc_call_t answer; aid_t req; Index: uspace/lib/c/generic/vol.c =================================================================== --- uspace/lib/c/generic/vol.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/generic/vol.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -119,5 +119,5 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); @@ -215,5 +215,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; @@ -257,5 +257,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; ipc_call_t answer; @@ -283,5 +283,5 @@ async_exch_t *exch; ipc_call_t answer; - sysarg_t retval; + int retval; exch = async_exchange_begin(vol->sess); Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/include/async.h (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -146,6 +146,6 @@ sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); -extern void async_wait_for(aid_t, sysarg_t *); -extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t); +extern void async_wait_for(aid_t, int *); +extern int async_wait_timeout(aid_t, int *, suseconds_t); extern void async_forget(aid_t); @@ -198,12 +198,12 @@ */ -extern sysarg_t async_answer_0(cap_handle_t, sysarg_t); -extern sysarg_t async_answer_1(cap_handle_t, sysarg_t, sysarg_t); -extern sysarg_t async_answer_2(cap_handle_t, sysarg_t, sysarg_t, sysarg_t); -extern sysarg_t async_answer_3(cap_handle_t, sysarg_t, sysarg_t, sysarg_t, +extern int async_answer_0(cap_handle_t, int); +extern int async_answer_1(cap_handle_t, int, sysarg_t); +extern int async_answer_2(cap_handle_t, int, sysarg_t, sysarg_t); +extern int async_answer_3(cap_handle_t, int, sysarg_t, sysarg_t, sysarg_t); -extern sysarg_t async_answer_4(cap_handle_t, sysarg_t, sysarg_t, sysarg_t, +extern int async_answer_4(cap_handle_t, int, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern sysarg_t async_answer_5(cap_handle_t, sysarg_t, sysarg_t, sysarg_t, +extern int async_answer_5(cap_handle_t, int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); @@ -338,8 +338,8 @@ rc3, rc4, rc5) -extern sysarg_t async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, +extern int async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); -extern sysarg_t async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, +extern int async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); @@ -468,5 +468,5 @@ extern int async_data_write_accept(void **, const bool, const size_t, const size_t, const size_t, size_t *); -extern void async_data_write_void(sysarg_t); +extern void async_data_write_void(int); extern int async_data_write_forward_fast(async_exch_t *, sysarg_t, sysarg_t, Index: uspace/lib/c/include/ipc/ipc.h =================================================================== --- uspace/lib/c/include/ipc/ipc.h (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/c/include/ipc/ipc.h (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -78,7 +78,7 @@ (arg5)) -extern sysarg_t ipc_answer_fast(cap_handle_t, sysarg_t, sysarg_t, sysarg_t, +extern int ipc_answer_fast(cap_handle_t, int, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern sysarg_t ipc_answer_slow(cap_handle_t, sysarg_t, sysarg_t, sysarg_t, +extern int ipc_answer_slow(cap_handle_t, int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/driver.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -199,5 +199,5 @@ dev_del_ref(dev); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -227,5 +227,5 @@ dev_del_ref(dev); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -262,5 +262,5 @@ fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -295,5 +295,5 @@ rc = ENOTSUP; - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } Index: uspace/lib/drv/generic/remote_ahci.c =================================================================== --- uspace/lib/drv/generic/remote_ahci.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_ahci.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -95,5 +95,5 @@ async_data_read_start(exch, sata_dev_name, sata_dev_name_length); - sysarg_t rc; + int rc; async_wait_for(req, &rc); @@ -155,5 +155,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; async_wait_for(req, &rc); @@ -175,5 +175,5 @@ async_exchange_end(exch); - sysarg_t rc; + int rc; async_wait_for(req, &rc); Index: uspace/lib/drv/generic/remote_ieee80211.c =================================================================== --- uspace/lib/drv/generic/remote_ieee80211.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_ieee80211.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -75,5 +75,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(aid, &res); @@ -130,5 +130,5 @@ assert(ssid_start); - sysarg_t rc_orig; + int rc_orig; async_exch_t *exch = async_exchange_begin(dev_sess); @@ -137,5 +137,5 @@ IEEE80211_CONNECT, NULL); - sysarg_t rc = async_data_write_start(exch, ssid_start, + int rc = async_data_write_start(exch, ssid_start, str_size(ssid_start) + 1); if (rc != EOK) { Index: uspace/lib/drv/generic/remote_nic.c =================================================================== --- uspace/lib/drv/generic/remote_nic.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_nic.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -105,5 +105,5 @@ aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), NIC_SEND_MESSAGE, &answer); - sysarg_t retval = async_data_write_start(exch, data, size); + int retval = async_data_write_start(exch, data, size); async_exchange_end(exch); @@ -131,5 +131,5 @@ ipc_call_t answer; int rc; - sysarg_t retval; + int retval; async_exch_t *exch = async_exchange_begin(dev_sess); @@ -147,5 +147,5 @@ async_wait_for(req, &retval); - return (int) retval; + return retval; } @@ -210,5 +210,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(aid, &res); @@ -237,5 +237,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(aid, &res); @@ -295,5 +295,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(aid, &res); @@ -629,5 +629,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(message_id, &res); @@ -717,5 +717,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(message_id, &res); @@ -878,5 +878,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(message_id, &res); @@ -938,5 +938,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(message_id, &res); @@ -997,5 +997,5 @@ NIC_WOL_VIRTUE_ADD, (sysarg_t) type, send_data, &result); - sysarg_t res; + int res; if (send_data) { int rc = async_data_write_start(exch, data, length); @@ -1311,5 +1311,5 @@ async_exchange_end(exch); - sysarg_t res; + int res; async_wait_for(message_id, &res); Index: uspace/lib/drv/generic/remote_usb.c =================================================================== --- uspace/lib/drv/generic/remote_usb.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_usb.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -233,6 +233,6 @@ /* Wait for the answer. */ - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -281,5 +281,5 @@ /* Wait for the answer. */ - sysarg_t opening_request_rc; + int opening_request_rc; async_wait_for(opening_request, &opening_request_rc); Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_usbhc.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -131,6 +131,6 @@ /* Wait for the answer. */ - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -182,5 +182,5 @@ /* Wait for the answer. */ - sysarg_t opening_request_rc; + int opening_request_rc; async_wait_for(opening_request, &opening_request_rc); Index: uspace/lib/drv/generic/remote_usbhid.c =================================================================== --- uspace/lib/drv/generic/remote_usbhid.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/drv/generic/remote_usbhid.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -174,6 +174,6 @@ } - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -259,6 +259,6 @@ } - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); Index: uspace/lib/hound/src/protocol.c =================================================================== --- uspace/lib/hound/src/protocol.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/hound/src/protocol.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -129,5 +129,5 @@ aid_t mid = async_send_1(exch, IPC_M_HOUND_CONTEXT_REGISTER, record, &call); - sysarg_t ret = mid ? EOK : EPARTY; + int ret = mid ? EOK : EPARTY; if (ret == EOK) @@ -191,5 +191,5 @@ connection != NULL, &res_call); - sysarg_t ret = EOK; + int ret = EOK; if (mid && connection) ret = async_data_write_start(exch, connection, @@ -259,5 +259,5 @@ ipc_call_t call; aid_t id = async_send_0(exch, IPC_M_HOUND_CONNECT, &call); - sysarg_t ret = id ? EOK : EPARTY; + int ret = id ? EOK : EPARTY; if (ret == EOK) ret = async_data_write_start(exch, source, str_size(source)); @@ -285,5 +285,5 @@ ipc_call_t call; aid_t id = async_send_0(exch, IPC_M_HOUND_DISCONNECT, &call); - sysarg_t ret = id ? EOK : EPARTY; + int ret = id ? EOK : EPARTY; if (ret == EOK) ret = async_data_write_start(exch, source, str_size(source)); Index: uspace/lib/nic/src/nic_ev.c =================================================================== --- uspace/lib/nic/src/nic_ev.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/nic/src/nic_ev.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -48,5 +48,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, NIC_EV_ADDR_CHANGED, &answer); - sysarg_t retval = async_data_write_start(exch, addr, + int retval = async_data_write_start(exch, addr, sizeof(nic_address_t)); @@ -81,5 +81,5 @@ ipc_call_t answer; aid_t req = async_send_0(exch, NIC_EV_RECEIVED, &answer); - sysarg_t retval = async_data_write_start(exch, data, size); + int retval = async_data_write_start(exch, data, size); async_exchange_end(exch); Index: uspace/lib/usbvirt/src/ipc_hc.c =================================================================== --- uspace/lib/usbvirt/src/ipc_hc.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/lib/usbvirt/src/ipc_hc.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -95,6 +95,6 @@ } - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -168,5 +168,5 @@ async_exchange_end(exch); - sysarg_t opening_request_rc; + int opening_request_rc; async_wait_for(opening_request, &opening_request_rc); @@ -230,6 +230,6 @@ } - sysarg_t data_request_rc; - sysarg_t opening_request_rc; + int data_request_rc; + int opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -305,5 +305,5 @@ } - sysarg_t opening_request_rc; + int opening_request_rc; async_wait_for(opening_request, &opening_request_rc); Index: uspace/srv/bd/vbd/vbd.c =================================================================== --- uspace/srv/bd/vbd/vbd.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/bd/vbd/vbd.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -115,5 +115,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + int retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); @@ -172,5 +172,5 @@ ltype = IPC_GET_ARG2(*icall); rc = vbds_label_create(disk_sid, ltype); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -184,5 +184,5 @@ disk_sid = IPC_GET_ARG1(*icall); rc = vbds_label_delete(disk_sid); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -219,5 +219,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + int retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); @@ -303,5 +303,5 @@ } - async_answer_1(iid, (sysarg_t)rc, (sysarg_t)part); + async_answer_1(iid, rc, (sysarg_t)part); } @@ -315,5 +315,5 @@ part = IPC_GET_ARG1(*icall); rc = vbds_part_delete(part); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } Index: uspace/srv/clipboard/clipboard.c =================================================================== --- uspace/srv/clipboard/clipboard.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/clipboard/clipboard.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -121,5 +121,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, clip_data, size); + int retval = async_data_read_finalize(callid, clip_data, size); if (retval != EOK) { async_answer_0(rid, retval); Index: uspace/srv/devman/client_conn.c =================================================================== --- uspace/srv/devman/client_conn.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/devman/client_conn.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -400,5 +400,5 @@ fibril_rwlock_read_unlock(&device_tree.rwlock); - sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size); + int retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); @@ -451,5 +451,5 @@ fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -476,5 +476,5 @@ fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } @@ -532,5 +532,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size); + int retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); @@ -572,5 +572,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size); + int retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); Index: uspace/srv/devman/driver.c =================================================================== --- uspace/srv/devman/driver.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/devman/driver.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -309,5 +309,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name); @@ -591,5 +591,5 @@ /* Send the device name to the driver. */ - sysarg_t rc = async_data_write_start(exch, dev->pfun->name, + int rc = async_data_write_start(exch, dev->pfun->name, str_size(dev->pfun->name) + 1); @@ -621,5 +621,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; driver_t *drv; devman_handle_t handle; @@ -644,5 +644,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; driver_t *drv; devman_handle_t handle; @@ -667,5 +667,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; driver_t *drv; devman_handle_t handle; @@ -695,5 +695,5 @@ { async_exch_t *exch; - sysarg_t retval; + int retval; driver_t *drv; devman_handle_t handle; Index: uspace/srv/devman/drv_conn.c =================================================================== --- uspace/srv/devman/drv_conn.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/devman/drv_conn.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -407,5 +407,5 @@ fun_busy_unlock(fun); fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); return; } @@ -414,5 +414,5 @@ fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) EOK); + async_answer_0(iid, EOK); } @@ -448,5 +448,5 @@ fun_busy_unlock(fun); fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); return; } @@ -454,5 +454,5 @@ fun_busy_unlock(fun); fun_del_ref(fun); - async_answer_0(iid, (sysarg_t) EOK); + async_answer_0(iid, EOK); } Index: uspace/srv/fs/locfs/locfs_ops.c =================================================================== --- uspace/srv/fs/locfs/locfs_ops.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/fs/locfs/locfs_ops.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -590,5 +590,5 @@ /* Wait for reply from the driver. */ - sysarg_t rc; + int rc; async_wait_for(msg, &rc); @@ -654,5 +654,5 @@ /* Wait for reply from the driver. */ - sysarg_t rc; + int rc; async_wait_for(msg, &rc); @@ -752,5 +752,5 @@ /* Wait for reply from the driver */ - sysarg_t rc; + int rc; async_wait_for(msg, &rc); Index: uspace/srv/locsrv/locsrv.c =================================================================== --- uspace/srv/locsrv/locsrv.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/locsrv/locsrv.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -599,5 +599,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, cat->name, + int retval = async_data_read_finalize(callid, cat->name, min(size, act_size)); @@ -647,5 +647,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, fqn, + int retval = async_data_read_finalize(callid, fqn, min(size, act_size)); free(fqn); @@ -694,5 +694,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, svc->server->name, + int retval = async_data_read_finalize(callid, svc->server->name, min(size, act_size)); @@ -1000,5 +1000,5 @@ fibril_mutex_unlock(&cdir.mutex); - sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + int retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); @@ -1047,5 +1047,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, desc, size); + int retval = async_data_read_finalize(callid, desc, size); free(desc); @@ -1110,5 +1110,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, desc, size); + int retval = async_data_read_finalize(callid, desc, size); free(desc); @@ -1163,5 +1163,5 @@ fibril_mutex_unlock(&cdir.mutex); - sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + int retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); @@ -1278,5 +1278,5 @@ catid_t cat_id; service_id_t svc_id; - sysarg_t retval; + int retval; svc_id = IPC_GET_ARG1(*icall); Index: uspace/srv/net/dnsrsrv/dnsrsrv.c =================================================================== --- uspace/srv/net/dnsrsrv/dnsrsrv.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/net/dnsrsrv/dnsrsrv.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -145,5 +145,5 @@ async_answer_0(callid, rc); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); dns_hostinfo_destroy(hinfo); @@ -205,5 +205,5 @@ } - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } Index: uspace/srv/net/inetsrv/inetcfg.c =================================================================== --- uspace/srv/net/inetsrv/inetcfg.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/net/inetsrv/inetcfg.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -364,5 +364,5 @@ } - async_answer_1(iid, (sysarg_t) rc, ainfo.ilink); + async_answer_1(iid, rc, ainfo.ilink); } @@ -419,5 +419,5 @@ size = min(act_size, max_size); - sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size); + int retval = async_data_read_finalize(rcallid, id_buf, size); free(id_buf); @@ -453,5 +453,5 @@ size = min(act_size, max_size); - sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size); + int retval = async_data_read_finalize(rcallid, id_buf, size); free(id_buf); @@ -487,5 +487,5 @@ size = min(act_size, max_size); - sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size); + int retval = async_data_read_finalize(rcallid, id_buf, size); free(id_buf); @@ -542,5 +542,5 @@ } - sysarg_t retval = async_data_read_finalize(name_callid, linfo.name, + int retval = async_data_read_finalize(name_callid, linfo.name, min(name_max_size, str_size(linfo.name))); if (retval != EOK) { @@ -714,5 +714,5 @@ free(srinfo.name); - async_answer_0(iid, (sysarg_t) rc); + async_answer_0(iid, rc); } Index: uspace/srv/net/inetsrv/inetping.c =================================================================== --- uspace/srv/net/inetsrv/inetping.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/net/inetsrv/inetping.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -130,8 +130,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } Index: uspace/srv/net/inetsrv/inetsrv.c =================================================================== --- uspace/srv/net/inetsrv/inetsrv.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/net/inetsrv/inetsrv.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -480,8 +480,8 @@ } - sysarg_t retval; + int retval; async_wait_for(req, &retval); - return (int) retval; + return retval; } Index: uspace/srv/ns/ns.c =================================================================== --- uspace/srv/ns/ns.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/ns/ns.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -80,5 +80,5 @@ task_id_t id; - sysarg_t retval; + int retval; service_t service; Index: uspace/srv/ns/service.c =================================================================== --- uspace/srv/ns/service.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/ns/service.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -173,5 +173,5 @@ sysarg_t arg3 = IPC_GET_ARG3(*call); sysarg_t flags = IPC_GET_ARG4(*call); - sysarg_t retval; + int retval; ht_link_t *link = hash_table_find(&service_hash_table, &service); Index: uspace/srv/vfs/vfs_file.c =================================================================== --- uspace/srv/vfs/vfs_file.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/vfs/vfs_file.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -145,5 +145,5 @@ vfs_exchange_release(exch); - sysarg_t rc; + int rc; async_wait_for(msg, &rc); Index: uspace/srv/vfs/vfs_lookup.c =================================================================== --- uspace/srv/vfs/vfs_lookup.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/vfs/vfs_lookup.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -197,5 +197,5 @@ rc = async_data_write_start(exch, component, str_size(component) + 1); - sysarg_t orig_rc; + int orig_rc; async_wait_for(req, &orig_rc); vfs_exchange_release(exch); @@ -213,5 +213,5 @@ assert(result); - sysarg_t rc; + int rc; ipc_call_t answer; async_exch_t *exch = vfs_exchange_grab(base->fs_handle); Index: uspace/srv/vfs/vfs_node.c =================================================================== --- uspace/srv/vfs/vfs_node.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/vfs/vfs_node.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -275,5 +275,5 @@ vfs_exchange_release(exch); - sysarg_t rc; + int rc; async_wait_for(req, &rc); Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/vfs/vfs_ops.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -152,5 +152,5 @@ &answer); /* Send the mount options */ - sysarg_t rc = async_data_write_start(exch, options, str_size(options)); + int rc = async_data_write_start(exch, options, str_size(options)); if (rc != EOK) { async_forget(msg); @@ -192,5 +192,5 @@ { fs_handle_t fs_handle = 0; - sysarg_t rc; + int rc; int retval; @@ -398,5 +398,5 @@ } - sysarg_t rc; + int rc; async_wait_for(msg, &rc); @@ -677,5 +677,5 @@ vfs_exchange_release(fs_exch); - sysarg_t rc; + int rc; async_wait_for(msg, &rc); @@ -689,5 +689,5 @@ { async_exch_t *exch = vfs_exchange_grab(fs_handle); - sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE, + int rc = async_req_4_0(exch, VFS_OUT_TRUNCATE, (sysarg_t) service_id, (sysarg_t) index, LOWER32(size), UPPER32(size)); Index: uspace/srv/volsrv/volsrv.c =================================================================== --- uspace/srv/volsrv/volsrv.c (revision d4a829e15ff53d4529f6faccc7aa01dc9efccd08) +++ uspace/srv/volsrv/volsrv.c (revision 25a179efc4ecca45aa90793992b6c1c2743fd07f) @@ -112,5 +112,5 @@ } - sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + int retval = async_data_read_finalize(callid, id_buf, size); free(id_buf);