Changeset ab87db5 in mainline for kernel/generic/src/udebug/udebug.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:

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

kernel/generic/src/udebug/udebug.c

@@ -141 +141 @@
                 TASK->udebug.begin_call = NULL;
 
-                IPC_SET_RETVAL(db_call->data, 0);
+                ipc_set_retval(&db_call->data, 0);
                 ipc_answer(&TASK->answerbox, db_call);
         } else if (TASK->udebug.dt_state == UDEBUG_TS_ACTIVE) {
@@ -160 +160 @@
                         assert(go_call);
 
-                        IPC_SET_RETVAL(go_call->data, 0);
-                        IPC_SET_ARG1(go_call->data, UDEBUG_EVENT_STOP);
+                        ipc_set_retval(&go_call->data, 0);
+                        ipc_set_arg1(&go_call->data, UDEBUG_EVENT_STOP);
 
                         THREAD->udebug.cur_event = UDEBUG_EVENT_STOP;
@@ -243 +243 @@
         THREAD->udebug.go_call = NULL;
 
-        IPC_SET_RETVAL(call->data, 0);
-        IPC_SET_ARG1(call->data, etype);
-        IPC_SET_ARG2(call->data, id);
-        IPC_SET_ARG3(call->data, rc);
+        ipc_set_retval(&call->data, 0);
+        ipc_set_arg1(&call->data, etype);
+        ipc_set_arg2(&call->data, id);
+        ipc_set_arg3(&call->data, rc);
 
         THREAD->udebug.syscall_args[0] = a1;
@@ -314 +314 @@
 
         THREAD->udebug.go_call = NULL;
-        IPC_SET_RETVAL(call->data, 0);
-        IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_B);
-        IPC_SET_ARG2(call->data, (sysarg_t) thread);
+        ipc_set_retval(&call->data, 0);
+        ipc_set_arg1(&call->data, UDEBUG_EVENT_THREAD_B);
+        ipc_set_arg2(&call->data, (sysarg_t) thread);
 
         /*
@@ -365 +365 @@
 
         THREAD->udebug.go_call = NULL;
-        IPC_SET_RETVAL(call->data, 0);
-        IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_E);
+        ipc_set_retval(&call->data, 0);
+        ipc_set_arg1(&call->data, UDEBUG_EVENT_THREAD_E);
 
         /* Prevent any further debug activity in thread. */
@@ -428 +428 @@
                                 LOG("Answer GO call with EVENT_FINISHED.");
 
-                                IPC_SET_RETVAL(thread->udebug.go_call->data, 0);
-                                IPC_SET_ARG1(thread->udebug.go_call->data,
+                                ipc_set_retval(&thread->udebug.go_call->data, 0);
+                                ipc_set_arg1(&thread->udebug.go_call->data,
                                     UDEBUG_EVENT_FINISHED);