diff options
| author | Miguel <m.i@gmx.at> | 2018-08-22 16:35:12 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-22 16:35:12 +0200 |
| commit | 98bf7b67543b36b6fe49f2b68c115ebeaf630603 (patch) | |
| tree | aad818381dfc42c4158b923d588bbe8d34f51e51 /kernel/multiboot.c | |
| parent | 323fb9d3e09903d6fa43ef7e1f0cc8934414c8d4 (diff) | |
cleanup logging
Diffstat (limited to 'kernel/multiboot.c')
| -rw-r--r-- | kernel/multiboot.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/kernel/multiboot.c b/kernel/multiboot.c index d1ab07c..a705e81 100644 --- a/kernel/multiboot.c +++ b/kernel/multiboot.c @@ -1,3 +1,4 @@ +#include "kernel/kernel.h" //https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-information-format #include "multiboot.h" @@ -6,78 +7,78 @@ multiboot_information* get_multiboot(uint32_t eax, uint32_t ebx) { - if(eax!=0x2badb002)panic(FOOLOS_MODULE_NAME,"EAX was not set properly by your bootlaoder!"); + if(eax!=0x2badb002)kpanic("EAX was not set properly by your bootlaoder!"); multiboot_information *info; info=ebx; - log(FOOLOS_MODULE_NAME,5,"multiboot flags: 0x%08X",info->flags); + klog("multiboot flags: 0x%08X",info->flags); if(info->flags&&1<<0) { - log(FOOLOS_MODULE_NAME,5,"[0] mem_lower: %d KB",info->mem_lower); - log(FOOLOS_MODULE_NAME,5,"[0] mem_upper: %d KB",info->mem_upper); + klog("[0] mem_lower: %d KB",info->mem_lower); + klog("[0] mem_upper: %d KB",info->mem_upper); } if(info->flags&&1<<1) { - log(FOOLOS_MODULE_NAME,5,"[1] boot-device 0x%08X",info->boot_device); + klog("[1] boot-device 0x%08X",info->boot_device); } if(info->flags&&1<<2) { - log(FOOLOS_MODULE_NAME,5,"[2] cmdline: \"%s\"",info->cmdline); + klog("[2] cmdline: \"%s\"",info->cmdline); } if(info->flags&&1<<3) { - log(FOOLOS_MODULE_NAME,5,"[3] loaded modules count: %d",info->mods_count); + klog("[3] loaded modules count: %d",info->mods_count); } if(info->flags&&1<<4) { - log(FOOLOS_MODULE_NAME,5,"[4/5] a.out kernel image symbols found"); + klog("[4/5] a.out kernel image symbols found"); } if(info->flags&&1<<5) { - log(FOOLOS_MODULE_NAME,5,"[4/5] ELF table: %d entries (sized %d) at 0x%08X",info->syms[0],info->syms[1],info->syms[2]); + klog("[4/5] ELF table: %d entries (sized %d) at 0x%08X",info->syms[0],info->syms[1],info->syms[2]); } if(info->flags&&1<<6) { - log(FOOLOS_MODULE_NAME,5,"[6] Found memory map"); + klog("[6] Found memory map"); } if(info->flags&&1<<7) { - log(FOOLOS_MODULE_NAME,5,"[7] Found Drives map"); + klog("[7] Found Drives map"); } if(info->flags&&1<<8) { - log(FOOLOS_MODULE_NAME,5,"[8] ROM Configuration Table at: 0x%08X",info->config_table); + klog("[8] ROM Configuration Table at: 0x%08X",info->config_table); } if(info->flags&&1<<9) { - log(FOOLOS_MODULE_NAME,5,"[9] Loaded by: \"%s\"",info->boot_loader_name); + klog("[9] Loaded by: \"%s\"",info->boot_loader_name); } if(info->flags&&1<<10) { - log(FOOLOS_MODULE_NAME,5,"[10] APM Table present."); + klog("[10] APM Table present."); } if(info->flags&&1<<11) { - log(FOOLOS_MODULE_NAME,5,"[11] VBE control info: 0x%08X",info->vbe_control_info); - log(FOOLOS_MODULE_NAME,5,"[11] VBE mode info: 0x%08X",info->vbe_mode_info); - log(FOOLOS_MODULE_NAME,5,"[11] VBE current mode (spec V3.0): 0x%08X",info->vbe_mode); + klog("[11] VBE control info: 0x%08X",info->vbe_control_info); + klog("[11] VBE mode info: 0x%08X",info->vbe_mode_info); + klog("[11] VBE current mode (spec V3.0): 0x%08X",info->vbe_mode); } if(info->flags&&1<<12) { - log(FOOLOS_MODULE_NAME,5,"[12] Framebuffer (w:%d h:%d bpp:%d) at addr=0x%08X",info->framebuffer_width,info->framebuffer_height,info->framebuffer_bpp,info->framebuffer_addr); + klog("[12] Framebuffer (w:%d h:%d bpp:%d) at addr=0x%08X",info->framebuffer_width,info->framebuffer_height,info->framebuffer_bpp,info->framebuffer_addr); } return info; |