Changeset bc73be3 in mainline for kernel/generic/src/ipc/irq.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/irq.c (modified) (2 diffs)

kernel/generic/src/ipc/irq.c

@@ -539 +539 @@
 
                 /* Set up args */
-                IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod);
-                IPC_SET_ARG1(call->data, irq->notif_cfg.scratch[1]);
-                IPC_SET_ARG2(call->data, irq->notif_cfg.scratch[2]);
-                IPC_SET_ARG3(call->data, irq->notif_cfg.scratch[3]);
-                IPC_SET_ARG4(call->data, irq->notif_cfg.scratch[4]);
-                IPC_SET_ARG5(call->data, irq->notif_cfg.scratch[5]);
+                ipc_set_imethod(&call->data, irq->notif_cfg.imethod);
+                ipc_set_arg1(&call->data, irq->notif_cfg.scratch[1]);
+                ipc_set_arg2(&call->data, irq->notif_cfg.scratch[2]);
+                ipc_set_arg3(&call->data, irq->notif_cfg.scratch[3]);
+                ipc_set_arg4(&call->data, irq->notif_cfg.scratch[4]);
+                ipc_set_arg5(&call->data, irq->notif_cfg.scratch[5]);
 
                 send_call(irq, call);
@@ -576 +576 @@
                 call->priv = ++irq->notif_cfg.counter;
 
-                IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod);
-                IPC_SET_ARG1(call->data, a1);
-                IPC_SET_ARG2(call->data, a2);
-                IPC_SET_ARG3(call->data, a3);
-                IPC_SET_ARG4(call->data, a4);
-                IPC_SET_ARG5(call->data, a5);
+                ipc_set_imethod(&call->data, irq->notif_cfg.imethod);
+                ipc_set_arg1(&call->data, a1);
+                ipc_set_arg2(&call->data, a2);
+                ipc_set_arg3(&call->data, a3);
+                ipc_set_arg4(&call->data, a4);
+                ipc_set_arg5(&call->data, a5);
 
                 send_call(irq, call);