diff options
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index ecb42eb..773ebad 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -7,27 +7,24 @@ #include <stdint.h> #include "config.h" -#include "asm/asm.h" // TODO: ?!?! #include "lib/logger/log.h" -#include "lib/buffer/ringbuffer.h" #include "timer.h" -#include "spinlock.h" -#include "syscalls.h" #include "mem.h" #include "vmem.h" #include "interrupts.h" -#include "keyboard.h" + +#include "syscalls.h" // for syscall_execve + + #include "console.h" -#include "fs/fs.h" -#include "fs/ext2.h" +// for built-in shell +#include "lib/buffer/ringbuffer.h" #include "task.h" -#include <stdint.h> -#include <stdlib.h> // CODE FOR Stack Smashing Protector, TODO: MOVE / and do not duplicate // with sys.c @@ -70,7 +67,7 @@ void kernel_main(uint32_t initial_stack, int mp) // // Activate Virtual Memory (paging) // - vmem_init(); + //vmem_init(); // // init output to screen @@ -81,16 +78,12 @@ void kernel_main(uint32_t initial_stack, int mp) // log buffered messages to console log_log(); - - // - // Setup PIC (interrupts) - // TODO: log! - pic_setup(); - // // Setup Interrupts (code segment: 0x08) // int_init(0x08); + + // @@ -108,6 +101,9 @@ void kernel_main(uint32_t initial_stack, int mp) */ + // task_init(); + // while(1); + // load and run foolshell // we will come back into the kernel only on interrupts... asm("mov $0x05bff,%esp"); // set stack pointer |