diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-13 02:27:05 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-13 02:27:05 +0100 |
| commit | 63b04ffc264aab5313811f1aa7ffc30715814e67 (patch) | |
| tree | cb6b8bb525bab093bd1484f7a2fd7ffdfa380b8d /kernel/kernel.c | |
| parent | b126d01e9687e6509c9d49b1b174c95aee603a89 (diff) | |
cleanup and refactoring. abstracting away console
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 45fc68c..29159f5 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -13,20 +13,22 @@ #include "spinlock.h" #include "syscalls.h" #include "mem.h" -#include "vesa.h" #include "interrupts.h" #include "acpi.h" #include "mp.h" #include "keyboard.h" +#include "console.h" #include "fs/fs.h" #include "fs/ext2.h" + #ifdef FOOLOS_COMPILE_FLOPPY #include "floppy.h" #endif + // some multiprocessor shit that should move away TODO uint32_t c1,c2,c3; volatile uint8_t proc; @@ -87,6 +89,8 @@ void kernel_main(uint32_t initial_stack, int mp) // log_init(); + console_init(); + // // We want to get output to the screen as fast as possible! // @@ -106,7 +110,9 @@ void kernel_main(uint32_t initial_stack, int mp) // this function returns the physical base address of // our video memory // - uint32_t vesa_physbase=vesa_init(0x9300,0x9400,0x168000+512);//0x80000+0x200); + + + //uint32_t vesa_physbase=vesa_init(0x9300,0x9400,0x168000+512);//0x80000+0x200); // self-log message of logger :P log_log(); |
