From 9132596b8e79a56a1ab0aa146bd837266ed61b09 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Sat, 11 Sep 2021 10:39:47 +0300
Subject: [PATCH] Kernel: Move ACPI and BIOS code into the new Firmware
 directory

This will somwhat help unify them also under the same SysFS directory in
the commit.
Also, it feels much more like this change reflects the reality that both
ACPI and the BIOS are part of the firmware on x86 computers.
---
 Kernel/Bus/PCI/Access.cpp                           | 2 +-
 Kernel/Bus/PCI/Initializer.cpp                      | 2 +-
 Kernel/CMakeLists.txt                               | 8 ++++----
 Kernel/Devices/HID/HIDManagement.cpp                | 2 +-
 Kernel/Devices/MemoryDevice.cpp                     | 2 +-
 Kernel/{ => Firmware}/ACPI/Definitions.h            | 0
 Kernel/{ => Firmware}/ACPI/Initialize.cpp           | 2 +-
 Kernel/{ => Firmware}/ACPI/Initialize.h             | 0
 Kernel/{ => Firmware}/ACPI/MultiProcessorParser.cpp | 4 ++--
 Kernel/{ => Firmware}/ACPI/MultiProcessorParser.h   | 0
 Kernel/{ => Firmware}/ACPI/Parser.cpp               | 4 ++--
 Kernel/{ => Firmware}/ACPI/Parser.h                 | 4 ++--
 Kernel/{Arch/PC => Firmware}/BIOS.cpp               | 2 +-
 Kernel/{Arch/PC => Firmware}/BIOS.h                 | 0
 Kernel/Interrupts/APIC.cpp                          | 2 +-
 Kernel/Interrupts/InterruptManagement.cpp           | 2 +-
 Kernel/Interrupts/InterruptManagement.h             | 2 +-
 Kernel/Syscalls/shutdown.cpp                        | 2 +-
 Kernel/Time/HPET.cpp                                | 2 +-
 Kernel/Time/TimeManagement.cpp                      | 2 +-
 Kernel/init.cpp                                     | 8 ++++----
 21 files changed, 26 insertions(+), 26 deletions(-)
 rename Kernel/{ => Firmware}/ACPI/Definitions.h (100%)
 rename Kernel/{ => Firmware}/ACPI/Initialize.cpp (96%)
 rename Kernel/{ => Firmware}/ACPI/Initialize.h (100%)
 rename Kernel/{ => Firmware}/ACPI/MultiProcessorParser.cpp (98%)
 rename Kernel/{ => Firmware}/ACPI/MultiProcessorParser.h (100%)
 rename Kernel/{ => Firmware}/ACPI/Parser.cpp (99%)
 rename Kernel/{ => Firmware}/ACPI/Parser.h (97%)
 rename Kernel/{Arch/PC => Firmware}/BIOS.cpp (99%)
 rename Kernel/{Arch/PC => Firmware}/BIOS.h (100%)

diff --git a/Kernel/Bus/PCI/Access.cpp b/Kernel/Bus/PCI/Access.cpp
index 018de241a4..d06aa5b49b 100644
--- a/Kernel/Bus/PCI/Access.cpp
+++ b/Kernel/Bus/PCI/Access.cpp
@@ -6,10 +6,10 @@
 
 #include <AK/ByteReader.h>
 #include <AK/HashTable.h>
-#include <Kernel/ACPI/Definitions.h>
 #include <Kernel/API/KResult.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Firmware/ACPI/Definitions.h>
 #include <Kernel/IO.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/Region.h>
diff --git a/Kernel/Bus/PCI/Initializer.cpp b/Kernel/Bus/PCI/Initializer.cpp
index 5fb1fb11b9..b23f005e14 100644
--- a/Kernel/Bus/PCI/Initializer.cpp
+++ b/Kernel/Bus/PCI/Initializer.cpp
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Bus/PCI/SysFSPCI.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/IO.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index bce235026f..622814cbac 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -19,11 +19,7 @@ set(KERNEL_HEAP_SOURCES
 )
 
 set(KERNEL_SOURCES
-    ACPI/Initialize.cpp
-    ACPI/MultiProcessorParser.cpp
-    ACPI/Parser.cpp
     AddressSanitizer.cpp
-    Arch/PC/BIOS.cpp
     Arch/x86/SmapDisabler.h
     Bus/PCI/Access.cpp
     Bus/PCI/API.cpp
@@ -127,6 +123,10 @@ set(KERNEL_SOURCES
     FileSystem/SysFSComponent.cpp
     FileSystem/TmpFS.cpp
     FileSystem/VirtualFileSystem.cpp
+    Firmware/ACPI/Initialize.cpp
+    Firmware/ACPI/MultiProcessorParser.cpp
+    Firmware/ACPI/Parser.cpp
+    Firmware/BIOS.cpp
     FutexQueue.cpp
     Interrupts/APIC.cpp
     Interrupts/GenericInterruptHandler.cpp
diff --git a/Kernel/Devices/HID/HIDManagement.cpp b/Kernel/Devices/HID/HIDManagement.cpp
index 0fdc78839b..c7211fefbb 100644
--- a/Kernel/Devices/HID/HIDManagement.cpp
+++ b/Kernel/Devices/HID/HIDManagement.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <AK/Singleton.h>
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
 #include <Kernel/Devices/HID/I8042Controller.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/MemoryDevice.cpp
index 80020f22ab..1bdb1b9b58 100644
--- a/Kernel/Devices/MemoryDevice.cpp
+++ b/Kernel/Devices/MemoryDevice.cpp
@@ -6,8 +6,8 @@
 
 #include <AK/Memory.h>
 #include <AK/StdLibExtras.h>
-#include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Devices/MemoryDevice.h>
+#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/ACPI/Definitions.h b/Kernel/Firmware/ACPI/Definitions.h
similarity index 100%
rename from Kernel/ACPI/Definitions.h
rename to Kernel/Firmware/ACPI/Definitions.h
diff --git a/Kernel/ACPI/Initialize.cpp b/Kernel/Firmware/ACPI/Initialize.cpp
similarity index 96%
rename from Kernel/ACPI/Initialize.cpp
rename to Kernel/Firmware/ACPI/Initialize.cpp
index 0ec9d0d5d1..07ae24e4bb 100644
--- a/Kernel/ACPI/Initialize.cpp
+++ b/Kernel/Firmware/ACPI/Initialize.cpp
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/ACPI/Initialize.h b/Kernel/Firmware/ACPI/Initialize.h
similarity index 100%
rename from Kernel/ACPI/Initialize.h
rename to Kernel/Firmware/ACPI/Initialize.h
diff --git a/Kernel/ACPI/MultiProcessorParser.cpp b/Kernel/Firmware/ACPI/MultiProcessorParser.cpp
similarity index 98%
rename from Kernel/ACPI/MultiProcessorParser.cpp
rename to Kernel/Firmware/ACPI/MultiProcessorParser.cpp
index bc9df20526..745f63d90a 100644
--- a/Kernel/ACPI/MultiProcessorParser.cpp
+++ b/Kernel/Firmware/ACPI/MultiProcessorParser.cpp
@@ -6,9 +6,9 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/ACPI/MultiProcessorParser.h>
-#include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Firmware/ACPI/MultiProcessorParser.h>
+#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/ACPI/MultiProcessorParser.h b/Kernel/Firmware/ACPI/MultiProcessorParser.h
similarity index 100%
rename from Kernel/ACPI/MultiProcessorParser.h
rename to Kernel/Firmware/ACPI/MultiProcessorParser.h
diff --git a/Kernel/ACPI/Parser.cpp b/Kernel/Firmware/ACPI/Parser.cpp
similarity index 99%
rename from Kernel/ACPI/Parser.cpp
rename to Kernel/Firmware/ACPI/Parser.cpp
index bf50541952..62f29801ad 100644
--- a/Kernel/ACPI/Parser.cpp
+++ b/Kernel/Firmware/ACPI/Parser.cpp
@@ -7,11 +7,11 @@
 
 #include <AK/Format.h>
 #include <AK/StringView.h>
-#include <Kernel/ACPI/Parser.h>
-#include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
+#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/IO.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h
similarity index 97%
rename from Kernel/ACPI/Parser.h
rename to Kernel/Firmware/ACPI/Parser.h
index 80b32217a1..f4fbfe8003 100644
--- a/Kernel/ACPI/Parser.h
+++ b/Kernel/Firmware/ACPI/Parser.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/ACPI/Definitions.h>
-#include <Kernel/ACPI/Initialize.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFSComponent.h>
+#include <Kernel/Firmware/ACPI/Definitions.h>
+#include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/PhysicalAddress.h>
diff --git a/Kernel/Arch/PC/BIOS.cpp b/Kernel/Firmware/BIOS.cpp
similarity index 99%
rename from Kernel/Arch/PC/BIOS.cpp
rename to Kernel/Firmware/BIOS.cpp
index 6b3ef621c7..f0842c5e3e 100644
--- a/Kernel/Arch/PC/BIOS.cpp
+++ b/Kernel/Firmware/BIOS.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
+#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/KBufferBuilder.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Arch/PC/BIOS.h b/Kernel/Firmware/BIOS.h
similarity index 100%
rename from Kernel/Arch/PC/BIOS.h
rename to Kernel/Firmware/BIOS.h
diff --git a/Kernel/Interrupts/APIC.cpp b/Kernel/Interrupts/APIC.cpp
index 98124015d7..faca203960 100644
--- a/Kernel/Interrupts/APIC.cpp
+++ b/Kernel/Interrupts/APIC.cpp
@@ -8,10 +8,10 @@
 #include <AK/Memory.h>
 #include <AK/Singleton.h>
 #include <AK/Types.h>
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Arch/x86/MSR.h>
 #include <Kernel/Arch/x86/ProcessorInfo.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/APIC.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
diff --git a/Kernel/Interrupts/InterruptManagement.cpp b/Kernel/Interrupts/InterruptManagement.cpp
index b1c6b9dae9..815d82bce0 100644
--- a/Kernel/Interrupts/InterruptManagement.cpp
+++ b/Kernel/Interrupts/InterruptManagement.cpp
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/ACPI/MultiProcessorParser.h>
 #include <Kernel/API/Syscall.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Arch/x86/Interrupts.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Firmware/ACPI/MultiProcessorParser.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/APIC.h>
 #include <Kernel/Interrupts/IOAPIC.h>
diff --git a/Kernel/Interrupts/InterruptManagement.h b/Kernel/Interrupts/InterruptManagement.h
index 52084172c5..c567e33bb2 100644
--- a/Kernel/Interrupts/InterruptManagement.h
+++ b/Kernel/Interrupts/InterruptManagement.h
@@ -12,7 +12,7 @@
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
-#include <Kernel/ACPI/Definitions.h>
+#include <Kernel/Firmware/ACPI/Definitions.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
 #include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Interrupts/IRQController.h>
diff --git a/Kernel/Syscalls/shutdown.cpp b/Kernel/Syscalls/shutdown.cpp
index add177a25f..ee1e8b5a74 100644
--- a/Kernel/Syscalls/shutdown.cpp
+++ b/Kernel/Syscalls/shutdown.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/FileSystem/FileSystem.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/IO.h>
 #include <Kernel/Process.h>
 #include <Kernel/TTY/ConsoleManagement.h>
diff --git a/Kernel/Time/HPET.cpp b/Kernel/Time/HPET.cpp
index 9b94806ecc..6feb05af86 100644
--- a/Kernel/Time/HPET.cpp
+++ b/Kernel/Time/HPET.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Interrupts/InterruptManagement.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index 35f71508f4..2bd25c94af 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -7,9 +7,9 @@
 #include <AK/Singleton.h>
 #include <AK/StdLibExtras.h>
 #include <AK/Time.h>
-#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Interrupts/APIC.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Scheduler.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index d4650b153e..130cdbc5ba 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -5,10 +5,6 @@
  */
 
 #include <AK/Types.h>
-#include <Kernel/ACPI/Initialize.h>
-#include <Kernel/ACPI/MultiProcessorParser.h>
-#include <Kernel/ACPI/Parser.h>
-#include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/Processor.h>
 #include <Kernel/BootInfo.h>
 #include <Kernel/Bus/PCI/Access.h>
@@ -31,6 +27,10 @@
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/SysFS.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
+#include <Kernel/Firmware/ACPI/Initialize.h>
+#include <Kernel/Firmware/ACPI/MultiProcessorParser.h>
+#include <Kernel/Firmware/ACPI/Parser.h>
+#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/SlabAllocator.h>
 #include <Kernel/Heap/kmalloc.h>