summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-01-20 22:18:02 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-01-20 22:18:02 +0100
commit068368d0bedc34f561ab0c9dd614c02b346d1d4e (patch)
tree5951082c13767904c9995c759263c18fcd17845e /kernel/main.c
parentbfa24f7e97eebd26561d87bbab643a9825e93392 (diff)
Added IRQ-support and timer interrupt.
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 55476ce..74ba441 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,6 +1,7 @@
#include "printf.h"
#include "gdt.h"
#include "idt.h"
+#include "irq.h"
void main() {
printf("main()\n");
@@ -11,6 +12,11 @@ void main() {
idt_init();
printf("IDT set.\n");
+ irq_init();
+ printf("IRQs set.\n");
+
+ asm volatile("sti");
+
printf("Halting.\n");
asm volatile(