Changeset eb3d379 in mainline for generic/src/ipc/ipcrsc.c

Timestamp:

2006-06-04T15:58:01Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8adafa0

Parents:

7669bcf

Message:

Slightly remodelled ipc hangups to facilitate correct cleanup.
Doc updates for frame allocator.

File:

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

generic/src/ipc/ipcrsc.c

@@ -159 +159 @@
         
         for (i=0; i < IPC_MAX_PHONES; i++) {
-                if (TASK->phones[i].busy==IPC_BUSY_FREE && !atomic_get(&TASK->phones[i].active_calls)) {
-                        TASK->phones[i].busy = IPC_BUSY_CONNECTING;
+                if (TASK->phones[i].state == IPC_PHONE_HUNGUP && \
+                    atomic_get(&TASK->phones[i].active_calls) == 0)
+                        TASK->phones[i].state = IPC_PHONE_FREE;
+
+                if (TASK->phones[i].state == IPC_PHONE_FREE) {
+                        TASK->phones[i].state = IPC_PHONE_CONNECTING;
                         break;
                 }
@@ -173 +177 @@
 static void phone_deallocp(phone_t *phone)
 {
-        ASSERT(phone->busy == IPC_BUSY_CONNECTING);
+        ASSERT(phone->state == IPC_PHONE_CONNECTING);
         ASSERT(! phone->callee);
         
         /* atomic operation */
-        phone->busy = IPC_BUSY_FREE;
+        phone->state = IPC_PHONE_FREE;
 }
 
@@ -201 +205 @@
         phone_t *phone = &TASK->phones[phoneid];
         
-        ASSERT(phone->busy == IPC_BUSY_CONNECTING);
+        ASSERT(phone->state == IPC_PHONE_CONNECTING);
         ipc_phone_connect(phone, box);
 }