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

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

File:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -159 +159 @@
 #ifdef KERNEL
 
-#include <synch/waitq.h>
-#include <adt/list.h>
-
-#define IPC_MAX_PHONES  16
-
-typedef struct answerbox_s answerbox_t;
-typedef struct phone_s phone_t;
+#include <proc/task.h>
+
 typedef struct {
         unative_t args[IPC_CALL_LEN];
         phone_t *phone;
 } ipc_data_t;
-
-struct answerbox_s {
-        SPINLOCK_DECLARE(lock);
-
-        task_t *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. */
-};
-
-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) */
-struct phone_s {
-        SPINLOCK_DECLARE(lock);
-        link_t link;
-        answerbox_t *callee;
-        ipc_phone_state_t state;
-        atomic_t active_calls;
-};
 
 typedef struct {