Changeset de57e060 in mainline for kernel/arch/ia64/include

Timestamp:

2006-10-18T20:51:15Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

80ca47e

Parents:

cd13c2a

Message:

Convert ia64 to the new IRQ and notification scheme.

Location:

kernel/arch/ia64/include

Files:

• drivers/it.h (modified) (1 diff)
• interrupt.h (modified) (3 diffs)
• ski/ski.h (modified) (1 diff)

kernel/arch/ia64/include/drivers/it.h

@@ -45 +45 @@
 
 extern void it_init(void);
-extern void it_interrupt(void);
 
 #endif

kernel/arch/ia64/include/interrupt.h

@@ -40 +40 @@
 #include <arch/register.h>
 
-#define IRQ_COUNT               257 /* 256 NOT suppotred IRQS*//* TODO */
-#define IRQ_KBD                 256 /* One simulated interrupt for ski simulator keyboard*/
+/** ia64 has 256 INRs. */
+#define INR_COUNT       256
+
+/*
+ * We need to keep this just to compile.
+ * We might eventually move interrupt/ stuff
+ * to genarch.
+ */
+#define IVT_ITEMS       0
+#define IVT_FIRST       0
 
 /** External Interrupt vectors. */
@@ -127 +135 @@
 static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->cr_iip)<0xe000000000000000ULL;
+        return (istate->cr_iip) < 0xe000000000000000ULL;
 }
 
@@ -137 +145 @@
 extern void nop_handler(uint64_t vector, istate_t *istate);
 extern void external_interrupt(uint64_t vector, istate_t *istate);
-extern void virtual_interrupt(uint64_t irq, void *param);
 extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 

kernel/arch/ia64/include/ski/ski.h

@@ -43 +43 @@
 #define SKI_PUTCHAR             31
 
+extern chardev_t ski_uconsole;
+
 extern void ski_init_console(void);
 extern void ski_set_console_sysinfo(void);
 extern void poll_keyboard(void);
 
-extern chardev_t ski_uconsole;
-extern int kbd_uspace;
+extern void ski_kbd_grab(void);
+extern void ski_kbd_release(void);
 
 #endif