Add the multiboot magic value to the startup info struct.

This commit is contained in:
Eryn Wells 2016-03-25 01:39:07 -04:00
parent e05ac6bd85
commit 9680a2a9c5
2 changed files with 3 additions and 0 deletions

View file

@ -25,6 +25,8 @@ struct StartupInformation
u32 kernelStart; u32 kernelStart;
/** Ending address (the first address *after* the last) of the kernel. */ /** Ending address (the first address *after* the last) of the kernel. */
u32 kernelEnd; u32 kernelEnd;
/** Multiboot's magic value. This should be verified. */
u32 multibootMagic;
/** Pointer to the multiboot information struct. */ /** Pointer to the multiboot information struct. */
multiboot::Information* multibootInformation; multiboot::Information* multibootInformation;
}; };

View file

@ -38,6 +38,7 @@ kmain(multiboot::Information *information,
kernel::StartupInformation startupInformation; kernel::StartupInformation startupInformation;
startupInformation.kernelStart = u32(&kernelStart); startupInformation.kernelStart = u32(&kernelStart);
startupInformation.kernelEnd = u32(&kernelEnd); startupInformation.kernelEnd = u32(&kernelEnd);
startupInformation.multibootMagic = magic;
startupInformation.multibootInformation = information; startupInformation.multibootInformation = information;
kernel.initialize(startupInformation); kernel.initialize(startupInformation);