Changeset b1e6269 in mainline for kernel/generic/src/ipc/ops/clnestab.c

Timestamp:

2012-08-24T22:27:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

20282ef3

Parents:

13dbaa8c

Message:

Add two new sysipc_ops_t members:

• request_forget()
• answer_cleanup()

Call these members to perform cleanup at appropriate times.

File:

• kernel/generic/src/ipc/ops/clnestab.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/clnestab.c

@@ -45 +45 @@
 }
 
+static void answer_cleanup(call_t *answer, ipc_data_t *olddata)
+{
+        phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
+
+        mutex_lock(&phone->lock);
+        if (phone->state == IPC_PHONE_CONNECTED) {
+                irq_spinlock_lock(&phone->callee->lock, true);
+                list_remove(&phone->link);
+                phone->state = IPC_PHONE_SLAMMED;
+                irq_spinlock_unlock(&phone->callee->lock, true);
+        }
+        mutex_unlock(&phone->lock);
+}
+
 static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
 
         if (IPC_GET_RETVAL(answer->data) != EOK) {
@@ -55 +68 @@
                  * connection without sending IPC_M_HUNGUP back.
                  */
-                mutex_lock(&phone->lock);
-                if (phone->state == IPC_PHONE_CONNECTED) {
-                        irq_spinlock_lock(&phone->callee->lock, true);
-                        list_remove(&phone->link);
-                        phone->state = IPC_PHONE_SLAMMED;
-                        irq_spinlock_unlock(&phone->callee->lock, true);
-                }
-                mutex_unlock(&phone->lock);
+                answer_cleanup(answer, olddata);
         }
         
@@ -70 +76 @@
 sysipc_ops_t ipc_m_clone_establish_ops = {
         .request_preprocess = request_preprocess,
+        .request_forget = null_request_forget,
         .request_process = null_request_process,
+        .answer_cleanup = answer_cleanup,
         .answer_preprocess = answer_preprocess,
         .answer_process = null_answer_process,