From 5faeb6be7b75a57d7a73df1ac18f8994f3f3c49e Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Thu, 28 Aug 2014 23:13:12 +0200 Subject: minor changes --- kernel/interrupts.c | 1 - kernel/kernel.c | 6 +----- kernel/vesa.c | 4 +++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/kernel/interrupts.c b/kernel/interrupts.c index b166669..167f0ad 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -55,7 +55,6 @@ void int_def_handler() } - //set a handler for a specific interrupt void int_install_ir(int irq, uint16_t flags, uint16_t sel, void *addr) { diff --git a/kernel/kernel.c b/kernel/kernel.c index d3555d1..898994c 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -51,10 +51,6 @@ void kernel_main() // vesa_init(0x8300,0x8400,0x7200); - // - // Now Fool OS can say hello :) - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,KERNEL_HELLO_MESSAGE); - // // PIT config (timer) timer_init(); @@ -63,7 +59,7 @@ void kernel_main() mem_init(0x7c00+0x400,*((uint16_t *)(0x7c00+0x600))); // paging (Todo) - //vmem_init(); + vmem_init(); // init and interrupt decriptor table int_init(0x08); diff --git a/kernel/vesa.c b/kernel/vesa.c index e8990b5..048dbf1 100644 --- a/kernel/vesa.c +++ b/kernel/vesa.c @@ -5,6 +5,8 @@ #include "../lib/logger/log.h" // logger facilities #define FOOLOS_MODULE_NAME "vesa" +#define FOOLSOS_SHOW_VESAMODES + typedef struct vbeinfo_struct{ char VbeSignature[4]; // == "VESA" uint16_t VbeVersion; // == 0x0300 for VBE 3.0 @@ -87,7 +89,7 @@ void vesa_init(vbeinfo *info,vbemodeinfo *mode,foolfont *rawfont) while(*modeptr!=0xffff&&*modeptr!=0) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mode supported : 0x%x", (*modeptr)); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"mode supported : 0x%x", (*modeptr)); modeptr++; } #endif -- cgit v1.2.3