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

Timestamp:

2011-06-18T15:35:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (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) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -166 +166 @@
         
         /** Phones connected to this answerbox. */
-        link_t connected_phones;
+        list_t connected_phones;
         /** Received calls. */
-        link_t calls;
-        link_t dispatched_calls;  /* Should be hash table in the future */
+        list_t calls;
+        list_t dispatched_calls;  /* Should be hash table in the future */
         
         /** Answered calls. */
-        link_t answers;
+        list_t answers;
         
         IRQ_SPINLOCK_DECLARE(irq_lock);
         
         /** Notifications from IRQ handlers. */
-        link_t irq_notifs;
+        list_t irq_notifs;
         /** IRQs with notifications to this answerbox. */
-        link_t irq_head;
+        list_t irq_list;
 } answerbox_t;
 
@@ -243 +243 @@
 extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
 extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
-extern void ipc_cleanup_call_list(link_t *);
+extern void ipc_cleanup_call_list(list_t *);
 
 extern void ipc_print_task(task_id_t);