Changeset ab87db5 in mainline for uspace/lib/c/generic/ipc.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/lib/c/generic/ipc.c (modified) (7 diffs)

uspace/lib/c/generic/ipc.c

@@ -71 +71 @@
 {
         return __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST,
-            CAP_HANDLE_RAW(phandle), imethod, arg1, arg2, arg3,
+            cap_handle_raw(phandle), imethod, arg1, arg2, arg3,
             (sysarg_t) label);
 }
@@ -98 +98 @@
         ipc_call_t data;
 
-        IPC_SET_IMETHOD(data, imethod);
-        IPC_SET_ARG1(data, arg1);
-        IPC_SET_ARG2(data, arg2);
-        IPC_SET_ARG3(data, arg3);
-        IPC_SET_ARG4(data, arg4);
-        IPC_SET_ARG5(data, arg5);
+        ipc_set_imethod(&data, imethod);
+        ipc_set_arg1(&data, arg1);
+        ipc_set_arg2(&data, arg2);
+        ipc_set_arg3(&data, arg3);
+        ipc_set_arg4(&data, arg4);
+        ipc_set_arg5(&data, arg5);
 
         return __SYSCALL3(SYS_IPC_CALL_ASYNC_SLOW,
-            CAP_HANDLE_RAW(phandle), (sysarg_t) &data,
+            cap_handle_raw(phandle), (sysarg_t) &data,
             (sysarg_t) label);
 }
@@ -130 +130 @@
 {
         return (errno_t) __SYSCALL6(SYS_IPC_ANSWER_FAST,
-            CAP_HANDLE_RAW(chandle), (sysarg_t) retval, arg1, arg2, arg3, arg4);
+            cap_handle_raw(chandle), (sysarg_t) retval, arg1, arg2, arg3, arg4);
 }
 
@@ -152 +152 @@
         ipc_call_t data;
 
-        IPC_SET_RETVAL(data, retval);
-        IPC_SET_ARG1(data, arg1);
-        IPC_SET_ARG2(data, arg2);
-        IPC_SET_ARG3(data, arg3);
-        IPC_SET_ARG4(data, arg4);
-        IPC_SET_ARG5(data, arg5);
+        ipc_set_retval(&data, retval);
+        ipc_set_arg1(&data, arg1);
+        ipc_set_arg2(&data, arg2);
+        ipc_set_arg3(&data, arg3);
+        ipc_set_arg4(&data, arg4);
+        ipc_set_arg5(&data, arg5);
 
         return (errno_t) __SYSCALL2(SYS_IPC_ANSWER_SLOW,
-            CAP_HANDLE_RAW(chandle), (sysarg_t) &data);
+            cap_handle_raw(chandle), (sysarg_t) &data);
 }
 
@@ -186 +186 @@
 errno_t ipc_hangup(cap_phone_handle_t phandle)
 {
-        return (errno_t) __SYSCALL1(SYS_IPC_HANGUP, CAP_HANDLE_RAW(phandle));
+        return (errno_t) __SYSCALL1(SYS_IPC_HANGUP, cap_handle_raw(phandle));
 }
 
@@ -210 +210 @@
 {
         return (errno_t) __SYSCALL6(SYS_IPC_FORWARD_FAST,
-            CAP_HANDLE_RAW(chandle), CAP_HANDLE_RAW(phandle), imethod, arg1,
+            cap_handle_raw(chandle), cap_handle_raw(phandle), imethod, arg1,
             arg2, mode);
 }
@@ -220 +220 @@
         ipc_call_t data;
 
-        IPC_SET_IMETHOD(data, imethod);
-        IPC_SET_ARG1(data, arg1);
-        IPC_SET_ARG2(data, arg2);
-        IPC_SET_ARG3(data, arg3);
-        IPC_SET_ARG4(data, arg4);
-        IPC_SET_ARG5(data, arg5);
+        ipc_set_imethod(&data, imethod);
+        ipc_set_arg1(&data, arg1);
+        ipc_set_arg2(&data, arg2);
+        ipc_set_arg3(&data, arg3);
+        ipc_set_arg4(&data, arg4);
+        ipc_set_arg5(&data, arg5);
 
         return (errno_t) __SYSCALL4(SYS_IPC_FORWARD_SLOW,
-            CAP_HANDLE_RAW(chandle), CAP_HANDLE_RAW(phandle), (sysarg_t) &data,
+            cap_handle_raw(chandle), cap_handle_raw(phandle), (sysarg_t) &data,
             mode);
 }