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 (file)
index c3c2cf5..0000000
--- a/include/multiboot2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2018, Tulio A M Mendes <[email protected]>
- * All rights reserved.
- * See LICENSE for details.
- *
- * Source: https://github.com/tadryanom/AdrOS
- */
-
-#ifndef MULTIBOOT2_H
-#define MULTIBOOT2_H
-
-#include <stdint.h>
-
-#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 7cd2e5dbf69205c27356c03cbf6911f051b85cb1..e689dabd0d144994ade7d939ff10b84c6a6e4c58 100644 (file)
--- 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"