Changeset 05ffb41 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2017-08-17T19:11:14Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c85bae

Parents:

7e3826d9

Message:

Turn IPC phones into kobjects

File:

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

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone id on success, or negative error code.
+ * @return Phone capability on success, or negative error code.
  *
  */
@@ -236 +236 @@
         }
         
-        int newphid = phone_alloc(TASK);
-        if (newphid < 0) {
+        int cap = phone_alloc(TASK);
+        if (cap < 0) {
                 mutex_unlock(&task->kb.cleanup_lock);
                 return ELIMIT;
@@ -243 +243 @@
         
         /* Connect the newly allocated phone to the kbox */
-        (void) ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
+        (void) ipc_phone_connect(phone_get_current(cap), &task->kb.box);
         
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return newphid;
+                return cap;
         }
         
@@ -263 +263 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return newphid;
+        return cap;
 }