thomas/mittos64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use debug macros

Browse Source
This commit is contained in:
Thomas Lovén 2018-02-13 18:19:54 +01:00
parent 497bdef9f4
commit 9dbbc7013c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/boot/kmain.c
View File

@ -8,14 +8,14 @@ void kmain(uint64_t multiboot_magic, void *multiboot_data)
{ {
serial_init(PORT_COM1); serial_init(PORT_COM1);
vga_init(); vga_init();
debug_printf("kernel loaded\n"); debug_info("kernel loaded\n");
parse_multiboot(multiboot_magic, P2V(multiboot_data)); parse_multiboot(multiboot_magic, P2V(multiboot_data));
debug_printf("Kernel was loaded with command line \"%s\", by <%s>\n", kernel_boot_data.commandline, kernel_boot_data.bootloader); debug_info("Kernel was loaded with command line \"%s\", by <%s>\n", kernel_boot_data.commandline, kernel_boot_data.bootloader);
debug_printf("Boot \"Complete\"\n"); debug_ok("Boot \"Complete\"\n");
PANIC("Reached end of kernel main function\n"); PANIC("Reached end of kernel main function\n");
for(;;); for(;;);

2
src/kernel/boot/multiboot.c
View File

@ -20,7 +20,7 @@ int parse_multiboot2(struct mboot2_taglist *tags)
kernel_boot_data.commandline = (char *)tag->data; kernel_boot_data.commandline = (char *)tag->data;
break; break;
default: default:
debug("[info] Unknown multiboot tag type:%d \n", tag->type); debug_warning("Unknown multiboot tag type:%d \n", tag->type);
} }
int padded_size = tag->size + ((tag->size % 8)?(8-(tag->size%8)):0); int padded_size = tag->size + ((tag->size % 8)?(8-(tag->size%8)):0);
tag = incptr(tag, padded_size); tag = incptr(tag, padded_size);