Changeset 2b017ba in mainline for kernel/generic/include

Timestamp:

2006-10-16T20:51:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5f9b4d9a

Parents:

e3890b3f

Message:

Replace the old IRQ dispatcher and IPC notifier with new implementation.
Note that all architectures except for sparc64 are now broken
and don't even compile.

Location:

kernel/generic/include

Files:

• ddi/irq.h (modified) (3 diffs)
• ipc/ipc.h (modified) (1 diff)
• ipc/irq.h (modified) (2 diffs)
• ipc/sysipc.h (modified) (2 diffs)
• typedefs.h (modified) (1 diff)

kernel/generic/include/ddi/irq.h

@@ -37 +37 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
-#include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <atomic.h>
 #include <synch/spinlock.h>
 
@@ -52 +51 @@
         IRQ_TRIGGER_EDGE
 } irq_trigger_t;
-
-typedef struct irq irq_t;
 
 typedef void (* irq_handler_t)(irq_t *irq, void *arg, ...);
@@ -88 +85 @@
         void *arg;
 
-        /** Answerbox of the task that wanted to be notified. */
-        answerbox_t *notif_answerbox;
-        /** Pseudo-code to be performed by the top-half
-         *  before a notification is sent. */
-        irq_code_t *code;
-        /** Method of the notification. */
-        unative_t method;
-        /** Counter of IRQ notifications. */
-        atomic_t counter;
+        /** Notification configuration structure. */
+        ipc_notif_cfg_t notif_cfg; 
 };
 

kernel/generic/include/ipc/ipc.h

@@ -156 +156 @@
 #ifdef KERNEL
 
-#include <synch/mutex.h>
-#include <synch/condvar.h>
+#include <synch/waitq.h>
 #include <adt/list.h>
 

kernel/generic/include/ipc/irq.h

@@ -39 +39 @@
 #define IRQ_MAX_PROG_SIZE 10
 
-/** Reserved 'virtual' messages for kernel notifications */
-#define IPC_IRQ_RESERVED_VIRTUAL 10
-
-#define IPC_IRQ_KLOG       (-1)
-#define IPC_IRQ_KBDRESTART (-2)
+#define VIRT_INR_KLOG           -2
+#define VIRT_INR_KBDRESTART     -3
 
 typedef enum {
@@ -76 +73 @@
 
 #include <ipc/ipc.h>
+#include <typedefs.h>
+#include <arch/types.h>
 
-extern void ipc_irq_make_table(int irqcount);
-extern int ipc_irq_register(answerbox_t *box, int irq, irq_code_t *ucode);
-extern void ipc_irq_send_notif(int irq);
-extern void ipc_irq_send_msg(int irq, unative_t a1, unative_t a2, unative_t a3);
-extern void ipc_irq_unregister(answerbox_t *box, int irq);
-extern void irq_ipc_bind_arch(unative_t irq);
+/** IPC notification config structure.
+ *
+ * Primarily, this structure is encapsulated in the irq_t structure.
+ * It is protected by irq_t::lock.
+ */
+struct ipc_notif_cfg {
+        answerbox_t *answerbox;         /**< Answerbox for notifications. */
+        unative_t method;               /**< Method to be used for the notification. */
+        irq_code_t *code;               /**< Top-half pseudocode. */
+        count_t counter;                /**< Counter. */
+};
+
+extern int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno, unative_t method,
+        irq_code_t *ucode);
+extern void ipc_irq_send_notif(irq_t *irq);
+extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3);
+extern void ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno);
 extern void ipc_irq_cleanup(answerbox_t *box);
 

kernel/generic/include/ipc/sysipc.h

@@ -39 +39 @@
 #include <ipc/irq.h>
 #include <arch/types.h>
+#include <typedefs.h>
 
 unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
@@ -54 +55 @@
                               unative_t method, unative_t arg1);
 unative_t sys_ipc_hangup(int phoneid);
-unative_t sys_ipc_register_irq(int irq, irq_code_t *ucode);
-unative_t sys_ipc_unregister_irq(int irq);
+unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method, irq_code_t *ucode);
+unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
 
 #endif

kernel/generic/include/typedefs.h

@@ -98 +98 @@
 typedef signed int inr_t;
 typedef signed int devno_t;
+typedef struct irq irq_t;
+typedef struct ipc_notif_cfg ipc_notif_cfg_t;
 
 #endif