X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fintr.c;h=a9bd5f1f772bb760af355be90d46e1a4c530e816;hp=5f49b8722cdcb91c6ae76d72d2fc08c80b77f4db;hb=a6507838a569762ec92493bfcb422e7dbc2cfae9;hpb=27a78ae0ed500338ad3df62e67709ff8cc247e6d

diff --git a/src/intr.c b/src/intr.c
index 5f49b87..a9bd5f1 100644
--- a/src/intr.c
+++ b/src/intr.c
@@ -60,6 +60,8 @@ static void gate_desc(desc_t *desc, uint16_t sel, uint32_t addr, int dpl, int ty
 /* defined in intr_asm.S */
 void set_idt(uint32_t addr, uint16_t limit);
 void intr_entry_default(void);
+void irq7_entry_check_spurious(void);
+void irq15_entry_check_spurious(void);
 
 /* the IDT (interrupt descriptor table) */
 static desc_t idt[256] __attribute__((aligned(8)));
@@ -90,6 +92,12 @@ void init_intr(void)
 	 */
 #include "intrtab.h"
 
+	/* change irq7 and irq15 to special entry points which first
+	 * make sure we didn't get a spurious interrupt before proceeding
+	 */
+	set_intr_entry(IRQ_TO_INTR(7), irq7_entry_check_spurious);
+	set_intr_entry(IRQ_TO_INTR(15), irq15_entry_check_spurious);
+
 	/* initialize the programmable interrupt controller
 	 * setting up the maping of IRQs [0, 15] to interrupts [32, 47]
 	 */