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

Timestamp:

2009-11-21T10:38:16Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

01607604

Parents:

4e739652 (diff), fd1210a (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 fix for #138 (Sync call answer may refer to a non-existent answerbox.)

File:

• kernel/generic/include/ipc/ipc.h (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -51 +51 @@
 /** This is answer to a call */
 #define IPC_CALL_ANSWERED       (1 << 0)
-/** This call will not be freed on error */
-#define IPC_CALL_STATIC_ALLOC   (1 << 1)
 /** Answer will not be passed to userspace, will be discarded */
-#define IPC_CALL_DISCARD_ANSWER (1 << 2)
+#define IPC_CALL_DISCARD_ANSWER (1 << 1)
 /** Call was forwarded */
-#define IPC_CALL_FORWARDED      (1 << 3)
+#define IPC_CALL_FORWARDED      (1 << 2)
 /** Identify connect_me_to answer */
-#define IPC_CALL_CONN_ME_TO     (1 << 4)
+#define IPC_CALL_CONN_ME_TO     (1 << 3)
 /** Interrupt notification */
-#define IPC_CALL_NOTIF          (1 << 5)
+#define IPC_CALL_NOTIF          (1 << 4)
 
 /*
@@ -267 +265 @@
         waitq_t wq;
 
+        /** Linkage for the list of task's synchronous answerboxes. */
+        link_t sync_box_link;
+
         /** Phones connected to this answerbox. */
         link_t connected_phones;
@@ -316 +317 @@
 } call_t;
 
+
+extern answerbox_t *ipc_phone_0;
+
+
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *, uint32_t, int);
-extern void ipc_answer(answerbox_t *, call_t *);
+
+extern call_t * ipc_call_alloc(int);
+extern void ipc_call_free(call_t *);
+
 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, int);
+extern int ipc_forward(call_t *, phone_t *, answerbox_t *, int);
+extern void ipc_answer(answerbox_t *, call_t *);
+
 extern void ipc_phone_init(phone_t *);
 extern void ipc_phone_connect(phone_t *, answerbox_t *);
-extern void ipc_call_free(call_t *);
-extern call_t * ipc_call_alloc(int);
+extern int ipc_phone_hangup(phone_t *);
+
 extern void ipc_answerbox_init(answerbox_t *, struct task *);
-extern void ipc_call_static_init(call_t *);
-extern void task_print_list(void);
-extern int ipc_forward(call_t *, phone_t *, answerbox_t *, int);
+
 extern void ipc_cleanup(void);
-extern int ipc_phone_hangup(phone_t *);
 extern void ipc_backsend_err(phone_t *, call_t *, unative_t);
-extern void ipc_print_task(task_id_t);
 extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
 extern void ipc_cleanup_call_list(link_t *);
 
-extern answerbox_t *ipc_phone_0;
+extern void ipc_print_task(task_id_t);
 
 #endif