From 1034574d1e988b541c4d408c1d6ea871b7a6b4f1 Mon Sep 17 00:00:00 2001
From: Jarkko Toivanen <jt@jakest.us>
Date: Tue, 1 Aug 2023 21:23:14 +0300
Subject: [PATCH] Making the Multiboot structure a bit shorter to conserve line
 length

---
 src/start32.asm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/start32.asm b/src/start32.asm
index a960eb0..767f3bf 100644
--- a/src/start32.asm
+++ b/src/start32.asm
@@ -2,19 +2,19 @@ format binary
 use32
 org 0x100000
 
-MULTIBOOT_HEADER_MAGIC      equ 0x1BADB002
-MULTIBOOT_PAGE_ALIGN        equ (1 shl 0)
-MULTIBOOT_MEMORY_INFO       equ (1 shl 1)
-MULTIBOOT_VIDEO_REQUEST     equ (1 shl 2)
-MULTIBOOT_AOUT_KLUDGE       equ (1 shl 16)
-MULTIBOOT_HEADER_FLAGS      equ MULTIBOOT_PAGE_ALIGN or MULTIBOOT_MEMORY_INFO or MULTIBOOT_VIDEO_REQUEST
-MULTIBOOT_HEADER_FLAGS      equ MULTIBOOT_PAGE_ALIGN or MULTIBOOT_MEMORY_INFO or MULTIBOOT_VIDEO_REQUEST or MULTIBOOT_AOUT_KLUDGE
-MULTIBOOT_CHECKSUM          equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
+MB_HEADER_MAGIC      equ 0x1BADB002
+MB_PAGE_ALIGN        equ (1 shl 0)
+MB_MEMORY_INFO       equ (1 shl 1)
+MB_VIDEO_REQUEST     equ (1 shl 2)
+MB_AOUT_KLUDGE       equ (1 shl 16)
+MB_HEADER_FLAGS      equ MB_PAGE_ALIGN or MB_MEMORY_INFO or MB_VIDEO_REQUEST
+MB_HEADER_FLAGS      equ MB_PAGE_ALIGN or MB_MEMORY_INFO or MB_VIDEO_REQUEST or MB_AOUT_KLUDGE
+MB_CHECKSUM          equ -(MB_HEADER_MAGIC + MB_HEADER_FLAGS)
 
 multiboot:
-	dd MULTIBOOT_HEADER_MAGIC
-	dd MULTIBOOT_HEADER_FLAGS
-	dd MULTIBOOT_CHECKSUM
+	dd MB_HEADER_MAGIC
+	dd MB_HEADER_FLAGS
+	dd MB_CHECKSUM
 	dd multiboot	; header address
 	dd 0x100000	; load address
 	dd bss	; load end address