Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[main] Reformat some output

Browse Source
This commit is contained in:
Kevin Lange 2011-01-19 13:00:03 -06:00
parent 4638059800
commit 0c84e38aa7
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
main.c
View File

@ -140,34 +140,38 @@ main(struct multiboot *mboot_ptr) {
/* Multiboot Debug */
kprintf("Received the following MULTIBOOT data:\n");
settextcolor(7,0);
kprintf("Flags: %x\t", mboot_ptr->flags);
kprintf("Mem Lo: %x\t", mboot_ptr->mem_lower);
kprintf("Mem Hi: %x\n", mboot_ptr->mem_upper);
kprintf("Boot dev: %x\t", mboot_ptr->boot_device);
kprintf("cmdline: %x\t", mboot_ptr->cmdline);
kprintf("Mods: %x\n", mboot_ptr->mods_count);
kprintf("Addr: %x\t", mboot_ptr->mods_addr);
kprintf("Syms: %x\t", mboot_ptr->num);
kprintf("Syms: %x\n", mboot_ptr->size);
kprintf("Syms: %x\t", mboot_ptr->addr);
kprintf("Syms: %x\t", mboot_ptr->shndx);
kprintf("MMap: %x\n", mboot_ptr->mmap_length);
kprintf("Addr: %x\t", mboot_ptr->mmap_addr);
kprintf("Drives: %x\t", mboot_ptr->drives_length);
kprintf("Addr: %x\n", mboot_ptr->drives_addr);
kprintf("Config: %x\t", mboot_ptr->config_table);
kprintf("Loader: %x\t", mboot_ptr->boot_loader_name);
kprintf("APM: %x\n", mboot_ptr->apm_table);
kprintf("VBE Control: %x\t", mboot_ptr->vbe_control_info);
kprintf("VBE Mode Info: %x\t", mboot_ptr->vbe_mode_info);
kprintf("VBE Mode: %x\n", mboot_ptr->vbe_mode);
kprintf("VBE seg: %x\t", mboot_ptr->vbe_interface_seg);
kprintf("VBE off: %x\t", mboot_ptr->vbe_interface_off);
kprintf("VBE len: %x\n", mboot_ptr->vbe_interface_len);
kprintf("Flags : 0x%x ", mboot_ptr->flags);
kprintf("Mem Lo: 0x%x ", mboot_ptr->mem_lower);
kprintf("Mem Hi: 0x%x ", mboot_ptr->mem_upper);
kprintf("Boot d: 0x%x\n", mboot_ptr->boot_device);
kprintf("cmdlin: 0x%x ", mboot_ptr->cmdline);
kprintf("Mods : 0x%x ", mboot_ptr->mods_count);
kprintf("Addr : 0x%x ", mboot_ptr->mods_addr);
kprintf("Syms : 0x%x\n", mboot_ptr->num);
kprintf("Syms : 0x%x ", mboot_ptr->size);
kprintf("Syms : 0x%x ", mboot_ptr->addr);
kprintf("Syms : 0x%x ", mboot_ptr->shndx);
kprintf("MMap : 0x%x\n", mboot_ptr->mmap_length);
kprintf("Addr : 0x%x ", mboot_ptr->mmap_addr);
kprintf("Drives: 0x%x ", mboot_ptr->drives_length);
kprintf("Addr : 0x%x ", mboot_ptr->drives_addr);
kprintf("Config: 0x%x\n", mboot_ptr->config_table);
kprintf("Loader: 0x%x ", mboot_ptr->boot_loader_name);
kprintf("APM : 0x%x ", mboot_ptr->apm_table);
kprintf("VBE Co: 0x%x ", mboot_ptr->vbe_control_info);
kprintf("VBE Mo: 0x%x\n", mboot_ptr->vbe_mode_info);
kprintf("VBE In: 0x%x ", mboot_ptr->vbe_mode);
kprintf("VBE se: 0x%x ", mboot_ptr->vbe_interface_seg);
kprintf("VBE of: 0x%x ", mboot_ptr->vbe_interface_off);
kprintf("VBE le: 0x%x\n", mboot_ptr->vbe_interface_len);
resettextcolor();
kprintf("(End multiboot raw data)\n");
kprintf("Started with: %s\n", (char *)mboot_ptr->cmdline);
kprintf("Booted from: %s\n", (char *)mboot_ptr->boot_loader_name);
kprintf("%dkB lower memory\n", mboot_ptr->mem_lower);
kprintf("%dkB higher memory ", mboot_ptr->mem_upper);
int mem_mb = mboot_ptr->mem_upper / 1024;
kprintf("(%dMB)\n", mem_mb);
settextcolor(7,0);
kprintf("Testing colors...\n");
resettextcolor();
@ -178,10 +182,16 @@ main(struct multiboot *mboot_ptr) {
}
putch('\n');
resettextcolor();
kprintf("%dkB lower memory\n", mboot_ptr->mem_lower);
kprintf("%dkB higher memory ", mboot_ptr->mem_upper);
int mem_mb = mboot_ptr->mem_upper / 1024;
kprintf("(%dMB)\n", mem_mb);
settextcolor(14,4);
kprintf(" = Roadmap = \n");
kprintf("- Paging\n");
kprintf("- Heap\n");
kprintf("- VFS\n");
kprintf("- Initial ramdisk\n");
kprintf("- Task switching\n");
kprintf("- User mode execution\n");
kprintf("- EXT2\n");
//for (;;);
return 0;