Changeset efdfebc in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2012-11-06T21:03:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (6 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.
@@ -151 +152 @@
         
         list_foreach(TASK->answerbox.dispatched_calls, lst) {
-                call_t *call = list_get_instance(lst, call_t, link);
+                call_t *call = list_get_instance(lst, call_t, ab_link);
                 if ((sysarg_t) call == callid) {
                         result = call;
@@ -162 +163 @@
 }
 
+/** 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;
+}
+
 /** Allocate new phone slot in the specified task.
  *
@@ -176 +194 @@
         size_t i;
         for (i = 0; i < IPC_MAX_PHONES; i++) {
-                if ((task->phones[i].state == IPC_PHONE_HUNGUP) &&
-                    (atomic_get(&task->phones[i].active_calls) == 0))
-                        task->phones[i].state = IPC_PHONE_FREE;
+                phone_t *phone = &task->phones[i];
+
+                if ((phone->state == IPC_PHONE_HUNGUP) &&
+                    (atomic_get(&phone->active_calls) == 0))
+                        phone->state = IPC_PHONE_FREE;
                 
-                if (task->phones[i].state == IPC_PHONE_FREE) {
-                        task->phones[i].state = IPC_PHONE_CONNECTING;
+                if (phone->state == IPC_PHONE_FREE) {
+                        phone->state = IPC_PHONE_CONNECTING;
                         break;
                 }
@@ -223 +243 @@
  * @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
@@ -229 +250 @@
  *
  */
-void phone_connect(int phoneid, answerbox_t *box)
+bool phone_connect(int phoneid, answerbox_t *box)
 {
         phone_t *phone = &TASK->phones[phoneid];
         
         ASSERT(phone->state == IPC_PHONE_CONNECTING);
-        ipc_phone_connect(phone, box);
+        return ipc_phone_connect(phone, box);
 }