From: Tulio A M Mendes Date: Tue, 10 Feb 2026 05:26:38 +0000 (-0300) Subject: refactor: remove include/multiboot2.h wrapper, use arch/x86/multiboot2.h directly X-Git-Url: https://projects.tadryanom.me/?a=commitdiff_plain;h=4b209f065dfd7917c88d086af141786c955262c4;p=AdrOS.git refactor: remove include/multiboot2.h wrapper, use arch/x86/multiboot2.h directly The generic wrapper include/multiboot2.h only forwarded to arch/x86/multiboot2.h under #if x86. Since Multiboot2 is purely x86/GRUB-specific, the wrapper should not exist in the generic include/ directory. pmm.c now includes arch/x86/multiboot2.h directly (already inside its own #if x86 guard). Passes: make, cppcheck, QEMU smoke test. --- diff --git a/include/multiboot2.h b/include/multiboot2.h deleted file mode 100644 index c3c2cf58..00000000 --- a/include/multiboot2.h +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2018, Tulio A M Mendes - * All rights reserved. - * See LICENSE for details. - * - * Source: https://github.com/tadryanom/AdrOS - */ - -#ifndef MULTIBOOT2_H -#define MULTIBOOT2_H - -#include - -#if defined(__i386__) || defined(__x86_64__) -#include "arch/x86/multiboot2.h" -#endif -#endif /* MULTIBOOT2_H */ diff --git a/src/mm/pmm.c b/src/mm/pmm.c index 7cd2e5db..e689dabd 100644 --- a/src/mm/pmm.c +++ b/src/mm/pmm.c @@ -9,7 +9,7 @@ #include "pmm.h" #if defined(__i386__) || defined(__x86_64__) -#include "multiboot2.h" +#include "arch/x86/multiboot2.h" #endif #include "utils.h" #include "uart_console.h"