From 474ba91122aa4b32fdd9348d90aec7468b3d2b8a Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 1 Feb 2015 21:35:36 -0500 Subject: a lotta changes, crashes on STI --- kernel/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'kernel/main.c') diff --git a/kernel/main.c b/kernel/main.c index fd56fb0..63ba635 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -5,9 +5,8 @@ #include "tty.h" #include -void irq1(struct regs_t *regs) +void interrupt(struct regs_t regs) { - printf("Keypress\n"); } void main(struct multiboot_header *hdr, uint32_t magic) @@ -15,17 +14,17 @@ void main(struct multiboot_header *hdr, uint32_t magic) tty_init(); gdt_init(); - printf("GDT initialized.\n"); - idt_init(); - printf("IDT initialized.\n"); isr_init(); irq_init(); - irq_set_handler(1, irq1); + for(int i=0;i<256;++i) + set_interrupt_handler(i, interrupt); + + asm("sti"); - printf("Hello, world!\n"); + printf("Boot finished.!\n"); while(1) ; } -- cgit v1.1