Kernel: Move VirtIO console code to the Devices/Serial/VirtIO directory

Cnidarias · May 14, 2024 · bbb749a · bbb749a
1 parent cb558f4
commit bbb749a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/Kernel/Bus/VirtIO/Transport/PCIe/Detect.cpp b/Kernel/Bus/VirtIO/Transport/PCIe/Detect.cpp
@@ -9,10 +9,10 @@
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Bus/VirtIO/Console.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/RNG.h>
 #include <Kernel/Bus/VirtIO/Transport/PCIe/Detect.h>
+#include <Kernel/Devices/Serial/VirtIO/Console.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::VirtIO {

diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
@@ -48,8 +48,6 @@ set(KERNEL_SOURCES
  Bus/VirtIO/Transport/PCIe/TransportLink.cpp
  Bus/VirtIO/Transport/Entity.cpp
  Bus/VirtIO/Transport/InterruptHandler.cpp
- Bus/VirtIO/Console.cpp
- Bus/VirtIO/ConsolePort.cpp
  Bus/VirtIO/Device.cpp
  Bus/VirtIO/Queue.cpp
  Bus/VirtIO/RNG.cpp
@@ -113,6 +111,8 @@ set(KERNEL_SOURCES
  Devices/GPU/VirtIO/GPU3DDevice.cpp
  Devices/GPU/VirtIO/GraphicsAdapter.cpp
  Devices/Loop/LoopDevice.cpp
+ Devices/Serial/VirtIO/Console.cpp
+ Devices/Serial/VirtIO/ConsolePort.cpp
  Devices/Storage/AHCI/ATADevice.cpp
  Devices/Storage/AHCI/ATADiskDevice.cpp
  Devices/Storage/AHCI/Controller.cpp

diff --git a/Kernel/Bus/VirtIO/Console.cpp → Kernel/Devices/Serial/VirtIO/Console.cpp b/Kernel/Bus/VirtIO/Console.cpp → Kernel/Devices/Serial/VirtIO/Console.cpp
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Bus/VirtIO/Console.h>
 #include <Kernel/Bus/VirtIO/Transport/PCIe/TransportLink.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Serial/VirtIO/Console.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/WorkQueue.h>
 

diff --git a/Kernel/Bus/VirtIO/Console.h → Kernel/Devices/Serial/VirtIO/Console.h b/Kernel/Bus/VirtIO/Console.h → Kernel/Devices/Serial/VirtIO/Console.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <Kernel/Bus/VirtIO/ConsolePort.h>
 #include <Kernel/Bus/VirtIO/Device.h>
+#include <Kernel/Devices/Serial/VirtIO/ConsolePort.h>
 #include <Kernel/Memory/RingBuffer.h>
 
 namespace Kernel::VirtIO {

diff --git a/Kernel/Bus/VirtIO/ConsolePort.cpp → Kernel/Devices/Serial/VirtIO/ConsolePort.cpp b/Kernel/Bus/VirtIO/ConsolePort.cpp → Kernel/Devices/Serial/VirtIO/ConsolePort.cpp
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Bus/VirtIO/Console.h>
-#include <Kernel/Bus/VirtIO/ConsolePort.h>
+#include <Kernel/Devices/Serial/VirtIO/Console.h>
+#include <Kernel/Devices/Serial/VirtIO/ConsolePort.h>
 
 namespace Kernel::VirtIO {
 

diff --git a/Kernel/Bus/VirtIO/ConsolePort.h → Kernel/Devices/Serial/VirtIO/ConsolePort.h b/Kernel/Bus/VirtIO/ConsolePort.h → Kernel/Devices/Serial/VirtIO/ConsolePort.h
diff --git a/Meta/gn/secondary/Kernel/BUILD.gn b/Meta/gn/secondary/Kernel/BUILD.gn
@@ -494,8 +494,6 @@ executable("Kernel_bin") {
  "Bus/USB/USBManagement.cpp",
  "Bus/USB/USBPipe.cpp",
  "Bus/USB/USBTransfer.cpp",
- "Bus/VirtIO/Console.cpp",
- "Bus/VirtIO/ConsolePort.cpp",
  "Bus/VirtIO/Device.cpp",
  "Bus/VirtIO/Queue.cpp",
  "Bus/VirtIO/RNG.cpp",
@@ -552,7 +550,8 @@ executable("Kernel_bin") {
  "Devices/HID/PS2/MouseDevice.cpp",
  "Devices/KCOVDevice.cpp",
  "Devices/KCOVInstance.cpp",
- "Devices/PCISerialDevice.cpp",
+ "Devices/Serial/VirtIO/Console.cpp",
+ "Devices/Serial/VirtIO/ConsolePort.cpp",
  "Devices/SerialDevice.cpp",
  "Devices/Storage/AHCI/ATAController.cpp",
  "Devices/Storage/AHCI/ATADevice.cpp",