diff options
Diffstat (limited to 'src/kernel/core/kmain.c')
| -rw-r--r-- | src/kernel/core/kmain.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/kernel/core/kmain.c b/src/kernel/core/kmain.c index 17c9425..8c36b54 100644 --- a/src/kernel/core/kmain.c +++ b/src/kernel/core/kmain.c @@ -4,7 +4,6 @@ #include "multiboot.h" #include "monitor.h" #include "sys.h" -#include "test.h" #include <task/idt.h> #include <task/timer.h> #include <task/task.h> @@ -56,8 +55,6 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { //kheap_init(); timer_init(30); tasking_init(); - - //test_run(); monitor_write("\n\nLoading modules :\n"); for (i = 0; i < mbd->mods_count; i++) { @@ -66,7 +63,7 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { if (elf_check((uint8_t*)mods[i].mod_start)) { monitor_write(" : Invalid ELF file\n"); } else { - struct process *pr = elf_exec((uint8_t*)mods[i].mod_start, PL_DRIVER); + struct process *pr = elf_exec((uint8_t*)mods[i].mod_start, PL_USER); if (pr == 0) { monitor_write(" : Error loading\n"); } else { @@ -77,6 +74,6 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { monitor_write("Modules now RULE THE WORLD !\n\n"); sti(); - tasking_switch(); + schedule(); PANIC("Should never happen. Something probably went wrong with multitasking."); } |