From c48d5402303b50104ff23b23214b3a42096c7eb5 Mon Sep 17 00:00:00 2001
From: "Liav A." <liavalb@gmail.com>
Date: Sat, 16 Mar 2024 00:20:12 +0200
Subject: [PATCH] Kernel: Move VGATextModeConsole code to the
 Arch/x86_64/ISABus directory

This code is specific to x86 machines, as virtually no other computer
architecture has any compatibility with old VGA legacy functionality.
---
 Kernel/Arch/init.cpp                                            | 2 +-
 .../x86_64/VGA/TextModeConsole.cpp}                             | 2 +-
 .../VGATextModeConsole.h => Arch/x86_64/VGA/TextModeConsole.h}  | 0
 Kernel/CMakeLists.txt                                           | 2 +-
 Meta/gn/secondary/Kernel/BUILD.gn                               | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename Kernel/{Devices/GPU/Console/VGATextModeConsole.cpp => Arch/x86_64/VGA/TextModeConsole.cpp} (98%)
 rename Kernel/{Devices/GPU/Console/VGATextModeConsole.h => Arch/x86_64/VGA/TextModeConsole.h} (100%)

diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index 251ae3d85a..e6a11e316d 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -68,7 +68,7 @@
 #    include <Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.h>
 #    include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #    include <Kernel/Arch/x86_64/Interrupts/PIC.h>
-#    include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
+#    include <Kernel/Arch/x86_64/VGA/TextModeConsole.h>
 #elif ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
 #    include <Kernel/Arch/aarch64/RPi/Mailbox.h>
diff --git a/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp b/Kernel/Arch/x86_64/VGA/TextModeConsole.cpp
similarity index 98%
rename from Kernel/Devices/GPU/Console/VGATextModeConsole.cpp
rename to Kernel/Arch/x86_64/VGA/TextModeConsole.cpp
index 850ef31fe8..615b30b301 100644
--- a/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp
+++ b/Kernel/Arch/x86_64/VGA/TextModeConsole.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
+#include <Kernel/Arch/x86_64/VGA/TextModeConsole.h>
 #include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Devices/GPU/Console/VGATextModeConsole.h b/Kernel/Arch/x86_64/VGA/TextModeConsole.h
similarity index 100%
rename from Kernel/Devices/GPU/Console/VGATextModeConsole.h
rename to Kernel/Arch/x86_64/VGA/TextModeConsole.h
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 482504f9ac..59f3322998 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -89,7 +89,6 @@ set(KERNEL_SOURCES
     Devices/GPU/Console/BootFramebufferConsole.cpp
     Devices/GPU/Console/GenericFramebufferConsole.cpp
     Devices/GPU/Console/ContiguousFramebufferConsole.cpp
-    Devices/GPU/Console/VGATextModeConsole.cpp
     Devices/GPU/DisplayConnector.cpp
     Devices/GPU/Generic/DisplayConnector.cpp
     Devices/GPU/Management.cpp
@@ -424,6 +423,7 @@ if ("${SERENITY_ARCH}" STREQUAL "x86_64")
         Arch/x86_64/PCI/MSI.cpp
 
         Arch/x86_64/VGA/IOArbiter.cpp
+        Arch/x86_64/VGA/TextModeConsole.cpp
 
         Arch/x86_64/PowerState.cpp
         Arch/x86_64/RTC.cpp
diff --git a/Meta/gn/secondary/Kernel/BUILD.gn b/Meta/gn/secondary/Kernel/BUILD.gn
index 62194b0884..a42d13e5bd 100644
--- a/Meta/gn/secondary/Kernel/BUILD.gn
+++ b/Meta/gn/secondary/Kernel/BUILD.gn
@@ -514,7 +514,6 @@ executable("Kernel_bin") {
     "Devices/GPU/Console/BootFramebufferConsole.cpp",
     "Devices/GPU/Console/ContiguousFramebufferConsole.cpp",
     "Devices/GPU/Console/GenericFramebufferConsole.cpp",
-    "Devices/GPU/Console/VGATextModeConsole.cpp",
     "Devices/GPU/DisplayConnector.cpp",
     "Devices/GPU/Generic/DisplayConnector.cpp",
     "Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp",