aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorMarvin Borner2021-06-02 22:27:59 +0200
committerMarvin Borner2021-06-02 22:27:59 +0200
commit98e15f73f090c32b5197ecec0845c408d4a54608 (patch)
tree31490731c74b45e2450de56c0c4ea4abd3f3b54d /kernel/main.c
parent91ba8d02037cc27c7b44f1bfd492c42ccd0af042 (diff)
Huge scheduler rewrite and other things
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 44198e4..d6e7727 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -3,8 +3,9 @@
#include <drivers/cpu.h>
#include <drivers/gdt.h>
#include <drivers/ide.h>
-#include <drivers/interrupts.h>
+#include <drivers/int.h>
#include <drivers/pci.h>
+#include <drivers/pic.h>
#include <drivers/rtc.h>
#include <drivers/serial.h>
#include <fs.h>
@@ -39,12 +40,10 @@ int kernel_main(u32 magic, u32 addr, u32 esp)
vfs_install();
ata_install();
pci_install();
- interrupts_install();
+ pic_install();
+ idt_install();
io_install();
- // Enable drivers
- sti();
-
syscall_init();
proc_init();