aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2020-04-29 19:21:29 +0200
committerMarvin Borner2020-04-29 19:21:29 +0200
commit4546c75d685475d8b9f215b588364e1d1bbd0b79 (patch)
tree2077f72ad46dfe877f7febdd0692edc139fd7937 /src/kernel/kernel.c
parent396d7d303d3bf0e796d0c817883ec1dec928352a (diff)
MUCH work in libc
Also cleaned up some syscalls etc
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index ffde014..c5b063a 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -26,16 +26,16 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp)
stack_hold = esp;
if (magic != MULTIBOOT_BOOTLOADER_MAGIC) {
- vga_log("Invalid boot magic!");
+ warn("Invalid boot magic!");
halt_loop();
}
if (multiboot_address & 7) {
- vga_log("Unaligned mbi!");
+ warn("Unaligned mbi!");
halt_loop();
}
- vga_log("Installing basic features of Melvix...");
+ info("Installing basic features of Melvix...");
// Install features
gdt_install();
@@ -44,7 +44,7 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp)
isrs_install();
irq_install();
- // multiboot_parse(multiboot_address); // TODO: Why does this break graphics?
+ multiboot_parse(multiboot_address);
paging_install();
// Install drivers