diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-17 21:21:07 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-17 21:21:07 +0100 |
| commit | 3d1f0b2cc16ba6a5bb1d47e24f4bb9e33a7e1aaf (patch) | |
| tree | 4e9f4e18563985c20b3406fe0f4241bf90674a2b /kernel/kernel.c | |
| parent | 3e151cb6371ecba06e21c3e56e0a95c8af4e93f9 (diff) | |
minor fixes and testing
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 5628e84..b45703a 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -8,7 +8,6 @@ #include "lib/buffer/ringbuffer.h" #include "smp.h" -#include "time.h" #include "timer.h" #include "spinlock.h" #include "syscalls.h" @@ -80,22 +79,22 @@ void kernel_main(uint32_t initial_stack, int mp) /////////////////// BULLSHIT ABOVE THIS LINE: TODO: CLEANUP // - // init system log ringbugger - // - log_init(); + // Print initial address of the esp stack pointer + // + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial esp: 0x%08X",initial_stack); - // - // The System Time // - task_system_clock=0; - + // Configuring the PIT timer. + // + timer_init(); + // // Memory Init // // after this is set up we will be able to allocate and deallocate // blocks of physical memory :) // - // we know that here, the bootloader placed the mamory map and + // we know that here, the bootloader placed the memory map and // the number of entries. // mem_init(0x7c00+1,*((uint16_t *)(0x7c00))); @@ -109,20 +108,11 @@ void kernel_main(uint32_t initial_stack, int mp) log_log(); // - // Print initial address of the esp stack pointer - // - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial esp: 0x%08X",initial_stack); - - // // Setup PIC // log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"setting up PIC."); pic_setup(); - // - // Configuring the PIT timer. - // - timer_init(); // mouse and kb driver init (before interrupts) // mouse_init(); |