os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

multiboot&memory stuff

This commit is contained in:
Adrien Bourmault 2019-03-13 09:19:43 +01:00
parent afdd3508c6
commit 9ab5bbc58c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kaleid/include/multiboot/multiboot.h
View File

@ -6,7 +6,7 @@
// // // //
// Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. // // 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 // // Permission is hereby granted, free of charge, to any person //
// obtaining a copy of this software and associated documentation // // obtaining a copy of this software and associated documentation //

18
kaleid/kernel/init/init.c
View File

@ -39,13 +39,19 @@ noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic)
// Kernel terminals // Kernel terminals
InitTerms(); InitTerms();
multiboot_uint32_t *grubver = mbInfo->boot_loader_name;
// We're out // We're out
StartPanic("We get\n *mbInfo : %x\n mbMagic : %x\n\n\ StartPanic( "We were loaded by : %s\n\n\n"
We were loaded by : %s \n\n\ "We get\n"
\nGoodbye World :(", mbInfo, mbMagic, grubver); " *mbInfo : %x\n"
" mbMagic : %x\n"
" mbBootdrv : %x\n"
"\nGoodbye World :(",
mbInfo->boot_loader_name,
mbInfo,
mbMagic,
mbInfo->boot_device
);
} }