Changes in kernel/generic/src/ipc/kbox.c [09d01f2:48bcf49] in mainline

File:

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

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @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)
+ * @return Phone capability handle on success, or negative error code.
+ *
+ */
+int ipc_connect_kbox(task_id_t taskid)
 {
         irq_spinlock_lock(&tasks_lock, true);
@@ -232 +231 @@
         }
         
-        if (task->kb.finished) {
+        if (task->kb.finished != false) {
                 mutex_unlock(&task->kb.cleanup_lock);
                 return EINVAL;
         }
         
-        /* Create a kbox thread if necessary. */
-        if (task->kb.thread == NULL) {
-                thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
-                    THREAD_FLAG_NONE, "kbox");
-                
-                if (!kb_thread) {
-                        mutex_unlock(&task->kb.cleanup_lock);
-                        return ENOMEM;
-                }
-                
-                task->kb.thread = kb_thread;
-                thread_ready(kb_thread);
-        }
-        
-        /* Allocate a new phone. */
-        cap_handle_t phone_handle;
-        int rc = phone_alloc(TASK, &phone_handle);
-        if (rc != EOK) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return rc;
+        cap_handle_t phone_handle = phone_alloc(TASK);
+        if (phone_handle < 0) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return phone_handle;
         }
         
@@ -265 +248 @@
         (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
         
+        if (task->kb.thread != NULL) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return phone_handle;
+        }
+        
+        /* Create a kbox thread */
+        thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
+            THREAD_FLAG_NONE, "kbox");
+        if (!kb_thread) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return ENOMEM;
+        }
+        
+        task->kb.thread = kb_thread;
+        thread_ready(kb_thread);
+        
         mutex_unlock(&task->kb.cleanup_lock);
-        *out_phone = phone_handle;
-        return EOK;
+        
+        return phone_handle;
 }