Changeset 33c2952 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2012-11-07T21:00:02Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

dcb0751

Parents:

fc89e32 (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:

Merged with mainline.

File:

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

kernel/generic/src/ipc/kbox.c

@@ -49 +49 @@
 {
         /*
+         * Not really needed, just to be consistent with the meaning of
+         * answerbox_t.active.
+         */
+        irq_spinlock_lock(&TASK->kb.box.lock, true);
+        TASK->kb.box.active = false;
+        irq_spinlock_unlock(&TASK->kb.box.lock, true);
+
+        /*
          * Only hold kb.cleanup_lock while setting kb.finished -
          * this is enough.
@@ -89 +97 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues. */
-        irq_spinlock_lock(&TASK->kb.box.lock, true);
-        ipc_cleanup_call_list(&TASK->kb.box.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->kb.box.calls);
-        irq_spinlock_unlock(&TASK->kb.box.lock, true);
+        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
+        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.dispatched_calls);
 }
 
@@ -163 +169 @@
         while (!done) {
                 call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
-                        SYNCH_FLAGS_NONE);
+                    SYNCH_FLAGS_NONE);
                 
                 if (call == NULL)
@@ -237 +243 @@
         
         /* Connect the newly allocated phone to the kbox */
-        ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
+        (void) ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
         
         if (task->kb.thread != NULL) {