From 9ab5bbc58c7fb52ab98c2e65d4be323be983b027 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 13 Mar 2019 09:19:43 +0100 Subject: [PATCH] multiboot&memory stuff --- kaleid/include/multiboot/multiboot.h | 2 +- kaleid/kernel/init/init.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/kaleid/include/multiboot/multiboot.h b/kaleid/include/multiboot/multiboot.h index 2a5d469..8c7d00f 100644 --- a/kaleid/include/multiboot/multiboot.h +++ b/kaleid/include/multiboot/multiboot.h @@ -6,7 +6,7 @@ // // // Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. // // // -// Note: In this header, "the software" refers to the multiboot.h file. // +// Note: In this header, "the Software" refers to the multiboot.h file. // // // // Permission is hereby granted, free of charge, to any person // // obtaining a copy of this software and associated documentation // diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index c41a1f2..d2dd85f 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -39,13 +39,19 @@ noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic) // Kernel terminals InitTerms(); - multiboot_uint32_t *grubver = mbInfo->boot_loader_name; - - // We're out - StartPanic("We get\n *mbInfo : %x\n mbMagic : %x\n\n\ - We were loaded by : %s \n\n\ - \nGoodbye World :(", mbInfo, mbMagic, grubver); + StartPanic( "We were loaded by : %s\n\n\n" + "We get\n" + " *mbInfo : %x\n" + " mbMagic : %x\n" + " mbBootdrv : %x\n" + "\nGoodbye World :(", + + mbInfo->boot_loader_name, + mbInfo, + mbMagic, + mbInfo->boot_device + ); }