Rework interrupt handling

[nameless-os.git] / kernel / kernel.c

diff --git a/kernel/kernel.c b/kernel/kernel.c
index 3f6c256d8029f2a06429da169381e0b401dea300..2af33720caf647ea2bf8e13a7df572795eb0cd07 100644 (file)
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -2,13 +2,13 @@
 #include <tty.h>
 #include <io.h>
 #include <irq/idt.h>
+#include <irq/interrupt.h>
 #include <irq/i8259a.h>
 #include <input/ps2.h>
 
-extern void double_fault(struct abort_frame *frame);
-extern void keyb_handler(struct interrupt_frame *frame);
 struct idt_descriptor idt[256] __attribute__((aligned(0x10)));
 struct idtr idtr __attribute__((aligned(0x10)));
+extern void (*_int_handler_table[48])(void);
 
 void kmain(void)
 {
@@ -17,6 +17,16 @@ void kmain(void)
        kprint("Welcome to Nameless OS!\nRunning revision: ", 0);
        kprint(GIT_COMMIT, 0);
        kprint("\n", 0);
+       kprint("Preparing IDT...\n", 0);
+       for (int i=0; i<48; i++) {
+               idt_set_descriptor(idt, i, 0x8, _int_handler_table[i], IDT_INTERRUPT_GATE, 0);
+       }
+       kprint("IDT prepared, loading...\n", 0);
+       populate_idtr(&idtr, idt);
+       load_idt(idtr);
+       kprint("Setting up interrupts...\n", 0);
+       pic_init(0x20, 0x28);
+       pic_mask_all();
        ps2_success = ps2_initialize();
        switch (ps2_success) {
                case -1:
@@ -28,16 +38,6 @@ void kmain(void)
                case 1:
                        kprint("Found two working PS/2 devices\n", 0);
        }
-       kprint("Preparing IDT...\n", 0);
-       idt_set_descriptor(idt, 0x8, 0x8, (uint32_t) double_fault, IDT_TRAP_GATE, 0x0);
-       idt_set_descriptor(idt, 0x21, 0x8, (uint32_t) keyb_handler, IDT_INTERRUPT_GATE, 0x0);
-       kprint("IDT prepared, loading...\n", 0);
-       populate_idtr(&idtr, idt);
-       load_idt(idtr);
-       kprint("IDT loaded, enabling interrupts...\n", 0);
-       pic_init(0x20, 0x28);
-       pic_mask_all();
-       pic_unmask(1);
        asm volatile ("sti");
        kprint("All done\n", 0);
        while(1);