Changes in kernel/generic/src/ipc/ipcrsc.c [c33f39f:9d58539] in mainline

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (5 diffs)

kernel/generic/src/ipc/ipcrsc.c

@@ -132 +132 @@
 #include <ipc/ipcrsc.h>
 #include <debug.h>
-#include <abi/errno.h>
 
 /** Find call_t * in call table according to callid.
@@ -152 +151 @@
         
         list_foreach(TASK->answerbox.dispatched_calls, lst) {
-                call_t *call = list_get_instance(lst, call_t, ab_link);
+                call_t *call = list_get_instance(lst, call_t, link);
                 if ((sysarg_t) call == callid) {
                         result = call;
@@ -161 +160 @@
         irq_spinlock_unlock(&TASK->answerbox.lock, true);
         return result;
-}
-
-/** Get phone from the current task by ID.
- *
- * @param phoneid Phone ID.
- * @param phone   Place to store pointer to phone.
- *
- * @return EOK on success, EINVAL if ID is invalid.
- *
- */
-int phone_get(sysarg_t phoneid, phone_t **phone)
-{
-        if (phoneid >= IPC_MAX_PHONES)
-                return EINVAL;
-        
-        *phone = &TASK->phones[phoneid];
-        return EOK;
 }
 
@@ -241 +223 @@
  * @param phoneid Phone handle to be connected.
  * @param box     Answerbox to which to connect the phone handle.
- * @return        True if the phone was connected, false otherwise.
  *
  * The procedure _enforces_ that the user first marks the phone
@@ -248 +229 @@
  *
  */
-bool phone_connect(int phoneid, answerbox_t *box)
+void phone_connect(int phoneid, answerbox_t *box)
 {
         phone_t *phone = &TASK->phones[phoneid];
         
         ASSERT(phone->state == IPC_PHONE_CONNECTING);
-        return ipc_phone_connect(phone, box);
+        ipc_phone_connect(phone, box);
 }