Changeset bc73be3 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/ipc/ipc.c (modified) (6 diffs)

kernel/generic/src/ipc/ipc.c

@@ -387 +387 @@
 {
         _ipc_call_actions_internal(phone, call, false);
-        IPC_SET_RETVAL(call->data, err);
+        ipc_set_retval(&call->data, err);
         _ipc_answer_free_call(call, false);
 }
@@ -485 +485 @@
                 assert(call);
 
-                IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
+                ipc_set_imethod(&call->data, IPC_M_PHONE_HUNGUP);
                 call->request_method = IPC_M_PHONE_HUNGUP;
                 call->flags |= IPC_CALL_DISCARD_ANSWER;
@@ -634 +634 @@
 
                 ipc_data_t old = call->data;
-                IPC_SET_RETVAL(call->data, EHANGUP);
+                ipc_set_retval(&call->data, EHANGUP);
                 answer_preprocess(call, &old);
                 _ipc_answer_free_call(call, true);
@@ -690 +690 @@
                         assert(call);
 
-                        IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
+                        ipc_set_imethod(&call->data, IPC_M_PHONE_HUNGUP);
                         call->request_method = IPC_M_PHONE_HUNGUP;
                         call->flags |= IPC_CALL_DISCARD_ANSWER;
@@ -909 +909 @@
                 printf("%-8" PRIun " %-6" PRIun " %-6" PRIun " %-6" PRIun
                     " %-6" PRIun " %-6" PRIun " %-7x",
-                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
-                    IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
-                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
+                    ipc_get_imethod(&call->data), ipc_get_arg1(&call->data),
+                    ipc_get_arg2(&call->data), ipc_get_arg3(&call->data),
+                    ipc_get_arg4(&call->data), ipc_get_arg5(&call->data),
                     call->flags);
 
@@ -931 +931 @@
         mutex_lock(&phone->lock);
         if (phone->state != IPC_PHONE_FREE) {
-                printf("%-11d %7" PRIun " ", (int) CAP_HANDLE_RAW(cap->handle),
+                printf("%-11d %7" PRIun " ", (int) cap_handle_raw(cap->handle),
                     atomic_load(&phone->active_calls));