From f61708d07ca580994c646a62b0a1b0f23e85b2cc Mon Sep 17 00:00:00 2001 From: Quinten Kock Date: Mon, 30 Nov 2020 03:43:11 +0100 Subject: [PATCH] Let main print more useful things, like bootloader info --- kernel/src/entry-stivale2.c | 3 ++- kernel/src/main.c | 10 +++++++--- kernel/src/main.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/src/entry-stivale2.c b/kernel/src/entry-stivale2.c index f1eeb1c..c3a6174 100644 --- a/kernel/src/entry-stivale2.c +++ b/kernel/src/entry-stivale2.c @@ -24,5 +24,6 @@ struct stivale2_header header2 = { }; void stivale2_main(struct stivale2_struct *info) { - kmain(); + char *argv[3] = {"stivale2", info->bootloader_brand, info->bootloader_version}; + kmain(3, argv); } diff --git a/kernel/src/main.c b/kernel/src/main.c index e4c02ff..0fd7c86 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -1,7 +1,11 @@ #include "vga.h" -void kmain() { - vga_puts("hello!"); - vga_putc('h'); +void kmain(int argc, char **argv) { + vga_puts("Kernel initialized!\n"); + vga_puts("Bootloader information:\t"); + for(int i = 0; i < argc; i++) { + vga_puts(argv[i]); + vga_putc('\t'); + } asm volatile ("hlt"); } diff --git a/kernel/src/main.h b/kernel/src/main.h index a79acd1..ecfda0c 100644 --- a/kernel/src/main.h +++ b/kernel/src/main.h @@ -1 +1 @@ -void kmain(); +void kmain(int argc, char** argv);