eryn/polka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format tweaking...

Browse source
This commit is contained in:
Eryn Wells 2016-03-20 00:42:44 -04:00
parent 4d7187e33e
commit 84b0ab7613
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Multiboot.hh
View file

@ -73,8 +73,7 @@ private:
* Indicates which BIOS disk the boot loader loaded the OS image from. * Indicates which BIOS disk the boot loader loaded the OS image from.
* Defined only if `bootDevice == true`. * Defined only if `bootDevice == true`.
*/ */
struct PACKED struct PACKED {
{
/** Third level partition number. If unused this is set to 0xFF. */ /** Third level partition number. If unused this is set to 0xFF. */
uint8_t partitionLevel3; uint8_t partitionLevel3;
/** Sub-partition number. If unused this is set to 0xFF. */ /** Sub-partition number. If unused this is set to 0xFF. */
@ -98,8 +97,7 @@ private:
* Indicates what boot modules were loaded along with the kernel image. * Indicates what boot modules were loaded along with the kernel image.
* Defined only if `modulesPresent == true`. * Defined only if `modulesPresent == true`.
*/ */
struct PACKED struct PACKED {
{
/** Number of boot modules present. */ /** Number of boot modules present. */
uint32_t count; uint32_t count;
/** Pointer to start of boot modules array. */ /** Pointer to start of boot modules array. */
@ -109,16 +107,13 @@ private:
// TODO: Document these. // TODO: Document these.
union PACKED union PACKED
{ {
struct PACKED struct PACKED {
{
uint32_t tableSize; uint32_t tableSize;
uint32_t stringSize; uint32_t stringSize;
uint32_t address; uint32_t address;
uint32_t reserved; uint32_t reserved;
} aout; } aout;
struct PACKED {
struct PACKED
{
uint32_t number; uint32_t number;
uint32_t size; uint32_t size;
uint32_t address; uint32_t address;
@ -142,8 +137,7 @@ private:
* Points to a buffer containing a list of drive definitions provided by the * Points to a buffer containing a list of drive definitions provided by the
* BIOS. Defined only if `drivesPresent == true`. * BIOS. Defined only if `drivesPresent == true`.
*/ */
struct PACKED struct PACKED {
{
/** Number of memory map entries present. */ /** Number of memory map entries present. */
uint32_t count; uint32_t count;
/** Pointer to start of memory map entry array. */ /** Pointer to start of memory map entry array. */