Changeset fa8e7d2 in mainline

Timestamp:

2007-01-30T12:51:03Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

80bcaed

Parents:

b612ded6

Message:

move ipc structures to ipc.h

Location:

kernel

Files:

• arch/sparc64/include/mm/page.h (modified) (1 diff)
• generic/include/ipc/ipc.h (modified) (2 diffs)
• generic/include/proc/task.h (modified) (2 diffs)

kernel/arch/sparc64/include/mm/page.h

@@ -47 +47 @@
 #ifndef __ASM__
 
-//#include <arch/types.h>
-//#include <genarch/mm/page_ht.h>
 #include <arch/interrupt.h>
 

kernel/generic/include/ipc/ipc.h

@@ -159 +159 @@
 #ifdef KERNEL
 
-#include <proc/task.h>
+#define IPC_MAX_PHONES  16
+
+#include <synch/waitq.h>
+
+struct answerbox;
+struct task;
+
+typedef enum {
+        IPC_PHONE_FREE = 0,     /**< Phone is free and can be allocated */
+        IPC_PHONE_CONNECTING,   /**< Phone is connecting somewhere */
+        IPC_PHONE_CONNECTED,    /**< Phone is connected */
+        IPC_PHONE_HUNGUP,       /**< Phone is hung up, waiting for answers to come */
+        IPC_PHONE_SLAMMED       /**< Phone was hungup from server */
+} ipc_phone_state_t;
+
+/** Structure identifying phone (in TASK structure) */
+typedef struct {
+        SPINLOCK_DECLARE(lock);
+        link_t link;
+        struct answerbox *callee;
+        ipc_phone_state_t state;
+        atomic_t active_calls;
+} phone_t;
+
+typedef struct answerbox {
+        SPINLOCK_DECLARE(lock);
+
+        struct task *task;
+
+        waitq_t wq;
+
+        link_t connected_phones;        /**< Phones connected to this answerbox */
+        link_t calls;                   /**< Received calls */
+        link_t dispatched_calls;        /* Should be hash table in the future */
+
+        link_t answers;                 /**< Answered calls */
+
+        SPINLOCK_DECLARE(irq_lock);
+        link_t irq_notifs;              /**< Notifications from IRQ handlers */
+        link_t irq_head;                /**< IRQs with notifications to this answerbox. */
+} answerbox_t;
 
 typedef struct {
@@ -172 +212 @@
 
         /* Identification of the caller */
-        task_t *sender;
+        struct task *sender;
         /* The caller box is different from sender->answerbox
          * for synchronous calls

kernel/generic/include/proc/task.h

@@ -37 +37 @@
 
 #include <cpu.h>
+#include <ipc/ipc.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
@@ -52 +53 @@
 #include <proc/scheduler.h>
 
-#define IPC_MAX_PHONES  16
-
-struct answerbox;
-struct task;
 struct thread;
-
-typedef enum {
-        IPC_PHONE_FREE = 0,     /**< Phone is free and can be allocated */
-        IPC_PHONE_CONNECTING,   /**< Phone is connecting somewhere */
-        IPC_PHONE_CONNECTED,    /**< Phone is connected */
-        IPC_PHONE_HUNGUP,       /**< Phone is hung up, waiting for answers to come */
-        IPC_PHONE_SLAMMED       /**< Phone was hungup from server */
-} ipc_phone_state_t;
-
-/** Structure identifying phone (in TASK structure) */
-typedef struct {
-        SPINLOCK_DECLARE(lock);
-        link_t link;
-        struct answerbox *callee;
-        ipc_phone_state_t state;
-        atomic_t active_calls;
-} phone_t;
-
-typedef struct answerbox {
-        SPINLOCK_DECLARE(lock);
-
-        struct task *task;
-
-        waitq_t wq;
-
-        link_t connected_phones;        /**< Phones connected to this answerbox */
-        link_t calls;                   /**< Received calls */
-        link_t dispatched_calls;        /* Should be hash table in the future */
-
-        link_t answers;                 /**< Answered calls */
-
-        SPINLOCK_DECLARE(irq_lock);
-        link_t irq_notifs;              /**< Notifications from IRQ handlers */
-        link_t irq_head;                /**< IRQs with notifications to this answerbox. */
-} answerbox_t;
 
 /** Task structure. */