X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fintr.c;h=e04a1775a41c83095d841b6073368a32d117cb7b;hb=41e4fa8d02a2ca85c871c8cc3a4c6c93331cdfb3;hp=5f49b8722cdcb91c6ae76d72d2fc08c80b77f4db;hpb=97356e29f73e12f0856fde92a48e86c73bef387c;p=bootcensus

diff --git a/src/intr.c b/src/intr.c
index 5f49b87..e04a177 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]
 	 */
@@ -108,7 +116,10 @@ struct intr_frame *get_intr_frame(void)
 /* set an interrupt handler function for a particular interrupt */
 void interrupt(int intr_num, intr_func_t func)
 {
+	int iflag = get_intr_flag();
+	disable_intr();
 	intr_func[intr_num] = func;
+	set_intr_flag(iflag);
 }
 
 /* this function is called from all interrupt entry points