Index: kernel/generic/include/ipc/sysipc.h =================================================================== --- kernel/generic/include/ipc/sysipc.h (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ kernel/generic/include/ipc/sysipc.h (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -41,6 +41,6 @@ unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, - unative_t arg1, ipc_data_t *data); -unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, + unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data); +unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question, ipc_data_t *reply); unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ kernel/generic/include/syscall/syscall.h (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -49,5 +49,5 @@ SYS_AS_AREA_DESTROY, SYS_IPC_CALL_SYNC_FAST, - SYS_IPC_CALL_SYNC, + SYS_IPC_CALL_SYNC_SLOW, SYS_IPC_CALL_ASYNC_FAST, SYS_IPC_CALL_ASYNC, Index: kernel/generic/src/ipc/sysipc.c =================================================================== --- kernel/generic/src/ipc/sysipc.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ kernel/generic/src/ipc/sysipc.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -349,10 +349,12 @@ /** Make a fast call over IPC, wait for reply and return to user. * - * This function can handle only one argument of payload, but is faster than - * the generic function (i.e. sys_ipc_call_sync()). + * This function can handle only three arguments of payload, but is faster than + * the generic function (i.e. sys_ipc_call_sync_slow()). * * @param phoneid Phone handle for the call. * @param method Method of the call. * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. * @param data Address of userspace structure where the reply call will * be stored. @@ -362,5 +364,5 @@ */ unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, - unative_t arg1, ipc_data_t *data) + unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data) { call_t call; @@ -373,4 +375,6 @@ IPC_SET_METHOD(call.data, method); IPC_SET_ARG1(call.data, arg1); + IPC_SET_ARG2(call.data, arg2); + IPC_SET_ARG3(call.data, arg3); if (!(res = request_preprocess(&call))) { @@ -394,5 +398,5 @@ * @return Zero on success or an error code. */ -unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, +unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question, ipc_data_t *reply) { Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ kernel/generic/src/syscall/syscall.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -134,5 +134,5 @@ /* IPC related syscalls. */ (syshandler_t) sys_ipc_call_sync_fast, - (syshandler_t) sys_ipc_call_sync, + (syshandler_t) sys_ipc_call_sync_slow, (syshandler_t) sys_ipc_call_async_fast, (syshandler_t) sys_ipc_call_async, Index: uspace/app/klog/klog.c =================================================================== --- uspace/app/klog/klog.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/app/klog/klog.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -64,7 +64,6 @@ mapping = as_get_mappable_page(PAGE_SIZE); - res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, - (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_KLOG, - NULL, NULL, NULL); + res = ipc_call_sync_3_0(PHONE_NS, IPC_M_AS_AREA_RECV, + (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_KLOG); if (res) { printf("Failed to initialize klog memarea\n"); Index: uspace/app/tester/ipc/send_sync.c =================================================================== --- uspace/app/tester/ipc/send_sync.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/app/tester/ipc/send_sync.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -30,4 +30,5 @@ #include #include "../tester.h" +#include char * test_send_sync(bool quiet) @@ -45,5 +46,5 @@ printf("Sending msg..."); - res = ipc_call_sync_2(phoneid, 2000, 0, 0, NULL, NULL); + res = ipc_call_sync_0_0(phoneid, 2000); printf("done: %d\n", res); Index: uspace/lib/libc/generic/ipc.c =================================================================== --- uspace/lib/libc/generic/ipc.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/lib/libc/generic/ipc.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -85,30 +85,7 @@ /** Make a fast synchronous call. * - * Only one payload argument can be passed using this function. However, this - * function is faster than the generic ipc_call_sync_3(). - * - * @param phoneid Phone handle for the call. - * @param method Requested method. - * @param arg1 Service-defined payload argument. - * @param result If non-NULL, the return ARG1 will be stored there. - * - * @return Negative values represent errors returned by IPC. - * Otherwise the RETVAL of the answer is returned. - */ -int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t *result) -{ - ipc_call_t resdata; - int callres; - - callres = __SYSCALL4(SYS_IPC_CALL_SYNC_FAST, phoneid, method, arg1, - (sysarg_t) &resdata); - if (callres) - return callres; - if (result) - *result = IPC_GET_ARG1(resdata); - return IPC_GET_RETVAL(resdata); -} - -/** Make a synchronous call transmitting 3 arguments of payload. + * Only three payload arguments can be passed using this function. However, this + * function is faster than the generic ipc_call_sync_slow() because the payload + * is passed directly in registers. * * @param phoneid Phone handle for the call. @@ -117,13 +94,61 @@ * @param arg2 Service-defined payload argument. * @param arg3 Service-defined payload argument. + * @param result1 If non-NULL, the return ARG1 will be stored there. + * @param result2 If non-NULL, the return ARG2 will be stored there. + * @param result3 If non-NULL, the return ARG3 will be stored there. + * @param result4 If non-NULL, the return ARG4 will be stored there. + * @param result5 If non-NULL, the return ARG5 will be stored there. + * + * @return Negative values represent errors returned by IPC. + * Otherwise the RETVAL of the answer is returned. + */ +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_t resdata; + int callres; + + callres = __SYSCALL6(SYS_IPC_CALL_SYNC_FAST, phoneid, method, arg1, + arg2, arg3, (sysarg_t) &resdata); + if (callres) + return callres; + if (result1) + *result1 = IPC_GET_ARG1(resdata); + if (result2) + *result2 = IPC_GET_ARG2(resdata); + if (result3) + *result3 = IPC_GET_ARG3(resdata); + if (result4) + *result4 = IPC_GET_ARG4(resdata); + if (result5) + *result5 = IPC_GET_ARG5(resdata); + + return IPC_GET_RETVAL(resdata); +} + +/** 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. */ -int ipc_call_sync_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, - ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3) +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_t data; @@ -134,6 +159,8 @@ IPC_SET_ARG2(data, arg2); IPC_SET_ARG3(data, arg3); - - callres = __SYSCALL3(SYS_IPC_CALL_SYNC, phoneid, (sysarg_t) &data, + IPC_SET_ARG4(data, arg4); + IPC_SET_ARG5(data, arg5); + + callres = __SYSCALL3(SYS_IPC_CALL_SYNC_SLOW, phoneid, (sysarg_t) &data, (sysarg_t) &data); if (callres) @@ -146,4 +173,9 @@ if (result3) *result3 = IPC_GET_ARG3(data); + if (result4) + *result4 = IPC_GET_ARG4(data); + if (result5) + *result5 = IPC_GET_ARG5(data); + return IPC_GET_RETVAL(data); } @@ -516,6 +548,6 @@ int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phonehash) { - return ipc_call_sync_3(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2, 0, 0, - 0, phonehash); + return ipc_call_sync_2_3(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2, + NULL, NULL, phonehash); } @@ -533,6 +565,6 @@ int res; - res = ipc_call_sync_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, 0, 0, 0, - &newphid); + res = ipc_call_sync_2_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, NULL, + NULL, &newphid); if (res) return res; @@ -606,6 +638,6 @@ int ipc_data_send(int phoneid, void *src, size_t size) { - return ipc_call_sync_3(phoneid, IPC_M_DATA_SEND, 0, (ipcarg_t) src, - (ipcarg_t) size, NULL, NULL, NULL); + return ipc_call_sync_3_0(phoneid, IPC_M_DATA_SEND, 0, (ipcarg_t) src, + (ipcarg_t) size); } Index: uspace/lib/libc/generic/time.c =================================================================== --- uspace/lib/libc/generic/time.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/lib/libc/generic/time.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -142,7 +142,7 @@ mapping = as_get_mappable_page(PAGE_SIZE); /* Get the mapping of kernel clock */ - res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, + res = ipc_call_sync_3_2(PHONE_NS, IPC_M_AS_AREA_RECV, (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL, - &rights, NULL); + &rights); if (res) { printf("Failed to initialize timeofday memarea\n"); Index: uspace/lib/libc/include/ipc/ipc.h =================================================================== --- uspace/lib/libc/include/ipc/ipc.h (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/lib/libc/include/ipc/ipc.h (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -52,13 +52,136 @@ ipc_call_t *data); -#define ipc_call_sync_2(phoneid, method, arg1, arg2, res1, res2) \ - ipc_call_sync_3((phoneid), (method), (arg1), (arg2), 0, (res1), \ - (res2), 0) -extern int ipc_call_sync_3(int phoneid, ipcarg_t method, ipcarg_t arg1, +/* + * User-friendly wrappers for ipc_call_sync_fast() and ipc_call_sync_slow(). + * They are in the form ipc_call_sync_m_n(), where m denotes the number of + * arguments of payload and n denotes number of return values. Whenever + * possible, the fast version is used. + */ +#define ipc_call_sync_0_0(phoneid, method) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, 0, 0, 0, 0, 0) +#define ipc_call_sync_0_1(phoneid, method, res1) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), 0, 0, 0, 0) +#define ipc_call_sync_0_2(phoneid, method, res1, res2) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), 0, 0, 0) +#define ipc_call_sync_0_3(phoneid, method, res1, res2, res3) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \ + 0, 0) +#define ipc_call_sync_0_4(phoneid, method, res1, res2, res3, res4) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \ + (res4), 0) +#define ipc_call_sync_0_5(phoneid, method, res1, res2, res3, res4, res5) \ + ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \ + (res4), (res5)) +#define ipc_call_sync_1_0(phoneid, method, arg1) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, 0, 0, 0, 0, 0) +#define ipc_call_sync_1_1(phoneid, method, arg1, res1) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), 0, 0, 0, 0) +#define ipc_call_sync_1_2(phoneid, method, arg1, res1, res2) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), 0, \ + 0, 0) +#define ipc_call_sync_1_3(phoneid, method, arg1, res1, res2, res3) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \ + (res3), 0, 0) +#define ipc_call_sync_1_4(phoneid, method, arg1, res1, res2, res3, res4) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \ + (res3), (res4), 0) +#define ipc_call_sync_1_5(phoneid, method, arg1, res1, res2, res3, res4, \ + res5) \ + ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \ + (res3), (res4), (res5)) +#define ipc_call_sync_2_0(phoneid, method, arg1, arg2) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, 0, 0, 0, \ + 0, 0) +#define ipc_call_sync_2_1(phoneid, method, arg1, arg2, res1) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), 0, 0, \ + 0, 0) +#define ipc_call_sync_2_2(phoneid, method, arg1, arg2, res1, res2) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \ + (res2), 0, 0, 0) +#define ipc_call_sync_2_3(phoneid, method, arg1, arg2, res1, res2, res3) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \ + (res2), (res3), 0, 0) +#define ipc_call_sync_2_4(phoneid, method, arg1, arg2, res1, res2, res3, \ + res4) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \ + (res2), (res3), (res4), 0) +#define ipc_call_sync_2_5(phoneid, method, arg1, arg2, res1, res2, res3, \ + res4, res5)\ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \ + (res2), (res3), (res4), (res5)) +#define ipc_call_sync_3_0(phoneid, method, arg1, arg2, arg3) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, 0, 0, \ + 0, 0) +#define ipc_call_sync_3_1(phoneid, method, arg1, arg2, arg3, res1) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \ + 0, 0, 0, 0) +#define ipc_call_sync_3_2(phoneid, method, arg1, arg2, arg3, res1, res2) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \ + (res2), 0, 0, 0) +#define ipc_call_sync_3_3(phoneid, method, arg1, arg2, arg3, res1, res2, \ + res3) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + (res1), (res2), (res3), 0, 0) +#define ipc_call_sync_3_4(phoneid, method, arg1, arg2, arg3, res1, res2, \ + res3, res4) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + (res1), (res2), (res3), (res4), 0) +#define ipc_call_sync_3_5(phoneid, method, arg1, arg2, arg3, res1, res2, \ + res3, res4, res5) \ + ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + (res1), (res2), (res3), (res4), (res5)) +#define ipc_call_sync_4_0(phoneid, method, arg1, arg2, arg3, arg4) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + 0, 0, 0, 0, 0) +#define ipc_call_sync_4_1(phoneid, method, arg1, arg2, arg3, arg4, res1) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (res1), 0, 0, 0, 0) +#define ipc_call_sync_4_2(phoneid, method, arg1, arg2, arg3, arg4, res1, res2) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (res1), (res2), 0, 0, 0) +#define ipc_call_sync_4_3(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \ + res3) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (res1), (res2), (res3), 0, 0) +#define ipc_call_sync_4_4(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \ + res3, res4) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (res1), (res2), (res3), (res4), 0) +#define ipc_call_sync_4_5(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \ + res3, res4, res5) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (res1), (res2), (res3), (res4), (res5)) +#define ipc_call_sync_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), 0, 0, 0, 0, 0) +#define ipc_call_sync_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (res1), 0, 0, 0, 0) +#define ipc_call_sync_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \ + res2) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (arg5), (res1), (res2), 0, 0, 0) +#define ipc_call_sync_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \ + res2, res3) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (arg5), (res1), (res2), (res3), 0, 0) +#define ipc_call_sync_5_4(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \ + res2, res3, res4) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (arg5), (res1), (res2), (res3), (res4), 0) +#define ipc_call_sync_5_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \ + res2, res3, res4, res5) \ + ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (arg5), (res1), (res2), (res3), (res4), (res5)) + +extern 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); - -extern int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, - ipcarg_t *result); + ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5); + +extern 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); + extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags); Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision e0bc7fccf48d7dd22900a4d0cf37421c390e5f62) +++ uspace/srv/fs/fat/fat.c (revision 2e51969e2c8c3905ceef1d73437f34d14c927dff) @@ -158,6 +158,6 @@ * Request sharing the Path Lookup Buffer with VFS. */ - rc = ipc_call_sync_3(vfs_phone, IPC_M_AS_AREA_RECV, (ipcarg_t) plb_ro, - PLB_SIZE, 0, NULL, NULL, NULL); + rc = ipc_call_sync_2_0(vfs_phone, IPC_M_AS_AREA_RECV, (ipcarg_t) plb_ro, + PLB_SIZE); if (rc) { async_wait_for(req, NULL);