Changeset 5c90e3e in mainline for kernel/generic/src/ipc/ops/concttome.c

Timestamp:

2012-10-18T22:38:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

508fff8

Parents:

b801f2d (diff), 7d248e3 (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/ops/concttome.c (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <arch.h>
 
-static int request_preprocess(call_t *call, phone_t *phone)
-{
-        /* Start with the assumption that there is no allocated phoneid. */
-        IPC_SET_ARG5(call->data, -1);
-        return EOK;
-}
-
 static int request_process(call_t *call, answerbox_t *box)
 {
@@ -56 +49 @@
 }
 
-static void answer_cleanup(call_t *answer, ipc_data_t *olddata)
+static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
         int phoneid = (int) IPC_GET_ARG5(*olddata);
@@ -62 +55 @@
         if (phoneid >= 0)
                 phone_dealloc(phoneid);
+
+        return EOK;
 }
 
@@ -91 +86 @@
 
 sysipc_ops_t ipc_m_connect_to_me_ops = {
-        .request_preprocess = request_preprocess,
+        .request_preprocess = null_request_preprocess,
         .request_forget = null_request_forget,
         .request_process = request_process,