Nucleus
Barry Initialising multitasking e483293 (3 years, 3 months ago)
diff --git a/kernel/main.c b/kernel/main.c
index 4536e45..bd16204 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -6,8 +6,9 @@
#include <stdint.h>
#include <string.h>
-#include <nucleus/memory.h>
#include <nucleus/panic.h>
+#include <nucleus/memory.h>
+#include <nucleus/task.h>
#include "multiboot.h"
#include "desc.h"
#include "acpi/acpi.h"
@@ -39,6 +40,8 @@ cpu_load(void)
/* Tables */
cpu_load_idt();
cpu_load_gdt();
+
+ asm volatile("sti");
}
/* Kernel main function */
@@ -55,10 +58,13 @@ kmain(uint32_t esp, struct MultibootInfo *mbinfo)
init_idt();
init_pic();
cpu_load();
+ /* Search ACPI tables */
init_acpi(ebda);
/* Initialise paging */
init_paging();
+ /* Initialise multitasking */
+ init_tasking();
panic("End of kernel!");
}