diff --git a/include/kernaux/multiboot2.h b/include/kernaux/multiboot2.h index cf3e1d8..d8cca10 100644 --- a/include/kernaux/multiboot2.h +++ b/include/kernaux/multiboot2.h @@ -25,6 +25,14 @@ extern "C" { * Header common types * ***********************/ +struct KernAux_Multiboot2_Header { + unsigned magic : 32; + unsigned arch : 32; + unsigned total_size : 32; + unsigned checksum : 32; +} +__attribute__((packed)); + enum KernAux_Multiboot2_HTag { KERNAUX_MULTIBOOT2_HTAG_NONE = 0, KERNAUX_MULTIBOOT2_HTAG_INFO_REQ = 1, @@ -39,14 +47,6 @@ enum KernAux_Multiboot2_HTag { KERNAUX_MULTIBOOT2_HTAG_RELOCATABLE_HEADER = 10, }; -struct KernAux_Multiboot2_Header { - unsigned magic : 32; - unsigned arch : 32; - unsigned total_size : 32; - unsigned checksum : 32; -} -__attribute__((packed)); - struct KernAux_Multiboot2_HTagBase { enum KernAux_Multiboot2_HTag type : 16; unsigned flags : 16; @@ -58,6 +58,12 @@ __attribute__((packed)); * Information common types * ****************************/ +struct KernAux_Multiboot2_Info { + unsigned total_size : 32; + unsigned reserved1 : 32; +} +__attribute__((packed)); + enum KernAux_Multiboot2_ITag { KERNAUX_MULTIBOOT2_ITAG_NONE = 0, KERNAUX_MULTIBOOT2_ITAG_BOOT_CMD_LINE = 1, @@ -83,12 +89,6 @@ enum KernAux_Multiboot2_ITag { KERNAUX_MULTIBOOT2_ITAG_IMAGE_LOAD_BASE_PHYS_ADDR = 21, }; -struct KernAux_Multiboot2_Info { - unsigned total_size : 32; - unsigned reserved1 : 32; -} -__attribute__((packed)); - struct KernAux_Multiboot2_ITagBase { enum KernAux_Multiboot2_ITag type : 32; unsigned size : 32;