Changeset affaf2e in mainline for kernel/generic/include/ipc/ipc.h

Timestamp:

2012-08-15T15:13:20Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

b546231

Parents:

f66ca57f (diff), 135486d (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/include/ipc/ipc.h (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -77 +77 @@
         waitq_t wq;
         
-        /** Linkage for the list of task's synchronous answerboxes. */
-        link_t sync_box_link;
-        
         /** Phones connected to this answerbox. */
         list_t connected_phones;
@@ -116 +113 @@
         struct task *sender;
         
-        /*
-         * The caller box is different from sender->answerbox
-         * for synchronous calls.
-         */
-        answerbox_t *callerbox;
-        
         /** Private data to internal IPC. */
         sysarg_t priv;
@@ -147 +138 @@
 
 extern int ipc_call(phone_t *, call_t *);
-extern int ipc_call_sync(phone_t *, call_t *);
 extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);