From 73aa1c6db67924c073d05cd167d4c70f4b7ae09f Mon Sep 17 00:00:00 2001 From: Marin Ivanov Date: Thu, 2 May 2024 18:22:59 +0300 Subject: cleanup: multiboot2 add endtag type --- src/bootstrap/boot.zig | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/bootstrap/boot.zig') diff --git a/src/bootstrap/boot.zig b/src/bootstrap/boot.zig index fcb60eb..998e1e5 100644 --- a/src/bootstrap/boot.zig +++ b/src/bootstrap/boot.zig @@ -6,15 +6,18 @@ comptime { const MAGIC = 0xE85250D6; const ARCHITECTURE = 0; +const EndTag = packed struct { + type: u16 = 0, + flags: u16 = 0, + size: u32 = 8, +}; + const MultibootHeader = extern struct { magic: u32, architecture: u32, header_len: u32, checksum: u32, - - tag0: u16, - tag1: u16, - tag2: u32, + endtag: EndTag, }; export const multiboot2 align(4) linksection(".multiboot") = MultibootHeader{ @@ -22,7 +25,5 @@ export const multiboot2 align(4) linksection(".multiboot") = MultibootHeader{ .architecture = ARCHITECTURE, .header_len = 24, .checksum = 0x100000000 - (MAGIC + ARCHITECTURE + 24), - .tag0 = 0, - .tag1 = 0, - .tag2 = 8, + .endtag = EndTag{}, }; -- cgit v1.2.3