Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/c/generic/async.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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; @@ -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: @@ -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); @@ -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); @@ -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) @@ -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; Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/c/generic/ipc.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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, sysarg_t method, sysarg_t arg1, sysarg_t arg2, +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, sysarg_t method, sysarg_t arg1, + * @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,19 +338,19 @@ * 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, sysarg_t method, sysarg_t arg1, + * @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); @@ -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, +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, method, arg1, + return __SYSCALL6(SYS_IPC_FORWARD_FAST, callid, phoneid, imethod, arg1, arg2, mode); } -int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method, +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); } Index: uspace/lib/c/generic/net/modules.c =================================================================== --- uspace/lib/c/generic/net/modules.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/c/generic/net/modules.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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 dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/c/generic/net/socket_client.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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); Index: uspace/lib/c/include/ipc/net.h =================================================================== --- uspace/lib/c/include/ipc/net.h (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/c/include/ipc/net.h (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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) /*@}*/ Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/drv/generic/driver.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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); - sysarg_t method = IPC_GET_METHOD(call); + sysarg_t method = IPC_GET_IMETHOD(call); int iface_idx; Index: uspace/lib/fs/libfs.c =================================================================== --- uspace/lib/fs/libfs.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/fs/libfs.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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/net/netif/netif_local.c =================================================================== --- uspace/lib/net/netif/netif_local.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/net/netif/netif_local.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -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/packet/generic/packet_server.c =================================================================== --- uspace/lib/packet/generic/packet_server.c (revision dd8d5a73bdea8475dd6109269d442c9d31c454a6) +++ uspace/lib/packet/generic/packet_server.c (revision 228e490270cec3d6a6de666f61839f0d9ed5f193) @@ -327,5 +327,5 @@ *answer_count = 0; - switch (IPC_GET_METHOD(*call)) { + switch (IPC_GET_IMETHOD(*call)) { case IPC_M_PHONE_HUNGUP: return EOK;