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

File:

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

kernel/generic/src/ipc/kbox.c

@@ -44 +44 @@
 #include <ipc/kbox.h>
 #include <print.h>
-#include <proc/thread.h>
 
 void ipc_kbox_cleanup(void)
@@ -206 +205 @@
  * cleanup code.
  *
- * @return Phone capability handle on success, or negative error code.
+ * @return Phone id on success, or negative error code.
  *
  */
@@ -236 +235 @@
         }
         
-        cap_handle_t phone_handle = phone_alloc(TASK);
-        if (phone_handle < 0) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return phone_handle;
-        }
-        
-        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
-            KOBJECT_TYPE_PHONE);
+        int newphid = phone_alloc(TASK);
+        if (newphid < 0) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return ELIMIT;
+        }
+        
         /* Connect the newly allocated phone to the kbox */
-        /* Hand over phone_obj's reference to ipc_phone_connect() */
-        (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
+        (void) ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
         
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return phone_handle;
+                return newphid;
         }
         
@@ -266 +262 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return phone_handle;
+        return newphid;
 }