Changeset cdc4334 in mainline

Timestamp:

2018-03-13T18:01:47Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c25a39e

Parents:

314f4b59

git-author:

Jakub Jermar <jakub@…> (2018-02-20 21:29:28)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:47)

Message:

Rename ipc_phone_0 to ipc_box_0 for consistency

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (1 diff)
• src/main/kinit.c (modified) (1 diff)
• src/proc/task.c (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -177 +177 @@
 extern slab_cache_t *phone_cache;
 
-extern answerbox_t *ipc_phone_0;
+extern answerbox_t *ipc_box_0;
 
 extern void ipc_init(void);

kernel/generic/src/ipc/ipc.c

@@ -63 +63 @@
 static void ipc_forget_call(call_t *);
 
-/** Open channel that is assigned automatically to new tasks */
-answerbox_t *ipc_phone_0 = NULL;
+/** Answerbox that new tasks are automatically connected to */
+answerbox_t *ipc_box_0 = NULL;
 
 static slab_cache_t *call_cache;

kernel/generic/src/main/kinit.c

@@ -265 +265 @@
                                     PERM_IO_MANAGER | PERM_IRQ_REG);
 
-                                if (!ipc_phone_0) {
-                                        ipc_phone_0 = &programs[i].task->answerbox;
+                                if (!ipc_box_0) {
+                                        ipc_box_0 = &programs[i].task->answerbox;
                                         /*
-                                         * Hold the first task so that the
-                                         * ipc_phone_0 remains a valid pointer
+                                         * Hold the first task so that
+                                         * ipc_box_0 remains a valid pointer
                                          * even if the first task exits for
                                          * whatever reason.

kernel/generic/src/proc/task.c

@@ -129 +129 @@
         size_t tasks_left;
 
-        if (ipc_phone_0) {
-                task_t *task_0 = ipc_phone_0->task;
-                ipc_phone_0 = NULL;
+        if (ipc_box_0) {
+                task_t *task_0 = ipc_box_0->task;
+                ipc_box_0 = NULL;
                 /*
                  * The first task is held by kinit(), we need to release it or
@@ -243 +243 @@
 #endif
 
-        if ((ipc_phone_0) &&
-            (container_check(ipc_phone_0->task->container, task->container))) {
+        if ((ipc_box_0) &&
+            (container_check(ipc_box_0->task->container, task->container))) {
                 cap_handle_t phone_handle;
                 errno_t rc = phone_alloc(task, &phone_handle);
@@ -256 +256 @@
                 kobject_t *phone_obj = kobject_get(task, phone_handle,
                     KOBJECT_TYPE_PHONE);
-                (void) ipc_phone_connect(phone_obj->phone, ipc_phone_0);
+                (void) ipc_phone_connect(phone_obj->phone, ipc_box_0);
         }