Changeset 12ab886 in mainline

Timestamp:

2008-04-05T11:06:10Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1383356

Parents:

776f2e6

Message:

Fix initialization of answerbox→task in ipc_answerbox_init.
Contributed by Jiri Svoboda.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (3 diffs)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -283 +283 @@
 
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *box, uint32_t usec, int flags);
-extern void ipc_answer(answerbox_t *box, call_t *request);
-extern int ipc_call(phone_t *phone, call_t *call);
-extern void ipc_call_sync(phone_t *phone, call_t *request);
-extern void ipc_phone_init(phone_t *phone);
-extern void ipc_phone_connect(phone_t *phone, answerbox_t *box);
-extern void ipc_call_free(call_t *call);
-extern call_t * ipc_call_alloc(int flags);
-extern void ipc_answerbox_init(answerbox_t *box);
-extern void ipc_call_static_init(call_t *call);
+extern call_t * ipc_wait_for_call(answerbox_t *, uint32_t, int);
+extern void ipc_answer(answerbox_t *, call_t *);
+extern int ipc_call(phone_t *, call_t *);
+extern void ipc_call_sync(phone_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 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 *call, phone_t *newphone, answerbox_t *oldbox,
-    int mode);
+extern int ipc_forward(call_t *, phone_t *, answerbox_t *, int);
 extern void ipc_cleanup(void);
-extern int ipc_phone_hangup(phone_t *phone);
-extern void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err);
-extern void ipc_print_task(task_id_t taskid);
+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 answerbox_t *ipc_phone_0;

kernel/generic/src/ipc/ipc.c

@@ -118 +118 @@
  *
  * @param box           Answerbox structure to be initialized.
- */
-void ipc_answerbox_init(answerbox_t *box)
+ * @param task          Task to which the answerbox belongs.
+ */
+void ipc_answerbox_init(answerbox_t *box, task_t *task)
 {
         spinlock_initialize(&box->lock, "ipc_box_lock");
@@ -130 +131 @@
         list_initialize(&box->irq_notifs);
         list_initialize(&box->irq_head);
-        box->task = TASK;
+        box->task = task;
 }
 
@@ -173 +174 @@
         answerbox_t sync_box; 
 
-        ipc_answerbox_init(&sync_box);
+        ipc_answerbox_init(&sync_box, TASK);
 
         /* We will receive data in a special box. */

kernel/generic/src/proc/task.c

@@ -172 +172 @@
         ta->cycles = 0;
         
-        ipc_answerbox_init(&ta->answerbox);
+        ipc_answerbox_init(&ta->answerbox, ta);
         for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&ta->phones[i]);