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.
SerenityOS · May 23, 2024 · c48d540 · c48d540
1 parent f4636a0
commit c48d540
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git 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/...evices/GPU/Console/VGATextModeConsole.cpp → Kernel/Arch/x86_64/VGA/TextModeConsole.cpp b/...evices/GPU/Console/VGATextModeConsole.cpp → 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/.../Devices/GPU/Console/VGATextModeConsole.h → Kernel/Arch/x86_64/VGA/TextModeConsole.h b/.../Devices/GPU/Console/VGATextModeConsole.h → Kernel/Arch/x86_64/VGA/TextModeConsole.h
diff --git 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
@@ -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",