Changeset 569a51a in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2017-12-08T21:17:27Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0016674

Parents:

071a1ddb

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 16:35:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return phone handle in SYS_IPC_CONNECT_KBOX separately from error code.

File:

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

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone capability handle on success, or negative error code.
- *
- */
-int ipc_connect_kbox(task_id_t taskid)
+ * @param[out] out_phone  Phone capability handle on success.
+ * @return Error code.
+ *
+ */
+int ipc_connect_kbox(task_id_t taskid, cap_handle_t *out_phone)
 {
         irq_spinlock_lock(&tasks_lock, true);
@@ -250 +251 @@
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return phone_handle;
+                *out_phone = phone_handle;
+                return EOK;
         }
         
@@ -257 +259 @@
             THREAD_FLAG_NONE, "kbox");
         if (!kb_thread) {
+                // FIXME: Shouldn't we clean up phone_handle?
                 mutex_unlock(&task->kb.cleanup_lock);
                 return ENOMEM;
@@ -266 +269 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return phone_handle;
+        *out_phone = phone_handle;
+        return EOK;
 }