diff --git a/Kernel/VirtIO/VirtIO.cpp b/Kernel/Bus/VirtIO/VirtIO.cpp similarity index 99% rename from Kernel/VirtIO/VirtIO.cpp rename to Kernel/Bus/VirtIO/VirtIO.cpp index 93e813e61d..5743b308b5 100644 --- a/Kernel/VirtIO/VirtIO.cpp +++ b/Kernel/Bus/VirtIO/VirtIO.cpp @@ -5,11 +5,11 @@ */ #include +#include +#include +#include #include #include -#include -#include -#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIO.h b/Kernel/Bus/VirtIO/VirtIO.h similarity index 99% rename from Kernel/VirtIO/VirtIO.h rename to Kernel/Bus/VirtIO/VirtIO.h index 8d15c6820c..b83b7358f5 100644 --- a/Kernel/VirtIO/VirtIO.h +++ b/Kernel/Bus/VirtIO/VirtIO.h @@ -9,10 +9,10 @@ #include #include #include +#include #include #include #include -#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIOConsole.cpp b/Kernel/Bus/VirtIO/VirtIOConsole.cpp similarity index 99% rename from Kernel/VirtIO/VirtIOConsole.cpp rename to Kernel/Bus/VirtIO/VirtIOConsole.cpp index 2bf1eef65e..73195af64e 100644 --- a/Kernel/VirtIO/VirtIOConsole.cpp +++ b/Kernel/Bus/VirtIO/VirtIOConsole.cpp @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include -#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIOConsole.h b/Kernel/Bus/VirtIO/VirtIOConsole.h similarity index 95% rename from Kernel/VirtIO/VirtIOConsole.h rename to Kernel/Bus/VirtIO/VirtIOConsole.h index e22c69372b..f1fb2c15b9 100644 --- a/Kernel/VirtIO/VirtIOConsole.h +++ b/Kernel/Bus/VirtIO/VirtIOConsole.h @@ -7,9 +7,9 @@ #pragma once +#include +#include #include -#include -#include namespace Kernel { class VirtIOConsole diff --git a/Kernel/VirtIO/VirtIOConsolePort.cpp b/Kernel/Bus/VirtIO/VirtIOConsolePort.cpp similarity index 98% rename from Kernel/VirtIO/VirtIOConsolePort.cpp rename to Kernel/Bus/VirtIO/VirtIOConsolePort.cpp index 791d3ae845..571d0c95f4 100644 --- a/Kernel/VirtIO/VirtIOConsolePort.cpp +++ b/Kernel/Bus/VirtIO/VirtIOConsolePort.cpp @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include +#include +#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIOConsolePort.h b/Kernel/Bus/VirtIO/VirtIOConsolePort.h similarity index 97% rename from Kernel/VirtIO/VirtIOConsolePort.h rename to Kernel/Bus/VirtIO/VirtIOConsolePort.h index c866d3eafd..3f863d144c 100644 --- a/Kernel/VirtIO/VirtIOConsolePort.h +++ b/Kernel/Bus/VirtIO/VirtIOConsolePort.h @@ -7,10 +7,10 @@ #pragma once +#include #include #include #include -#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIOQueue.cpp b/Kernel/Bus/VirtIO/VirtIOQueue.cpp similarity index 99% rename from Kernel/VirtIO/VirtIOQueue.cpp rename to Kernel/Bus/VirtIO/VirtIOQueue.cpp index 9cad608e47..499059e8dc 100644 --- a/Kernel/VirtIO/VirtIOQueue.cpp +++ b/Kernel/Bus/VirtIO/VirtIOQueue.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIOQueue.h b/Kernel/Bus/VirtIO/VirtIOQueue.h similarity index 100% rename from Kernel/VirtIO/VirtIOQueue.h rename to Kernel/Bus/VirtIO/VirtIOQueue.h diff --git a/Kernel/VirtIO/VirtIORNG.cpp b/Kernel/Bus/VirtIO/VirtIORNG.cpp similarity index 98% rename from Kernel/VirtIO/VirtIORNG.cpp rename to Kernel/Bus/VirtIO/VirtIORNG.cpp index c3fbf889d6..302a054790 100644 --- a/Kernel/VirtIO/VirtIORNG.cpp +++ b/Kernel/Bus/VirtIO/VirtIORNG.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include -#include namespace Kernel { diff --git a/Kernel/VirtIO/VirtIORNG.h b/Kernel/Bus/VirtIO/VirtIORNG.h similarity index 97% rename from Kernel/VirtIO/VirtIORNG.h rename to Kernel/Bus/VirtIO/VirtIORNG.h index 8a4cd93148..12a2223a68 100644 --- a/Kernel/VirtIO/VirtIORNG.h +++ b/Kernel/Bus/VirtIO/VirtIORNG.h @@ -6,9 +6,9 @@ #pragma once +#include #include #include -#include namespace Kernel { diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index b0b12804f9..2d0f3b53c3 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -37,6 +37,11 @@ set(KERNEL_SOURCES Bus/USB/USBManagement.cpp Bus/USB/USBPipe.cpp Bus/USB/USBTransfer.cpp + Bus/VirtIO/VirtIO.cpp + Bus/VirtIO/VirtIOConsole.cpp + Bus/VirtIO/VirtIOConsolePort.cpp + Bus/VirtIO/VirtIOQueue.cpp + Bus/VirtIO/VirtIORNG.cpp CMOS.cpp CommandLine.cpp ConsoleDevice.cpp @@ -270,11 +275,6 @@ set(KERNEL_SOURCES TimerQueue.cpp UBSanitizer.cpp UserOrKernelBuffer.cpp - VirtIO/VirtIO.cpp - VirtIO/VirtIOConsole.cpp - VirtIO/VirtIOConsolePort.cpp - VirtIO/VirtIOQueue.cpp - VirtIO/VirtIORNG.cpp WaitQueue.cpp WorkQueue.cpp init.cpp diff --git a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h b/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h index f972a65c6b..f0a2b81231 100644 --- a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h +++ b/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h @@ -6,10 +6,10 @@ #pragma once +#include +#include #include #include -#include -#include namespace Kernel::Graphics::VirtIOGPU { diff --git a/Kernel/Graphics/VirtIOGPU/GPU.h b/Kernel/Graphics/VirtIOGPU/GPU.h index 11a55adc67..81d576b804 100644 --- a/Kernel/Graphics/VirtIOGPU/GPU.h +++ b/Kernel/Graphics/VirtIOGPU/GPU.h @@ -8,10 +8,10 @@ #include #include +#include +#include #include #include -#include -#include #define VIRTIO_GPU_F_VIRGL (1 << 0) #define VIRTIO_GPU_F_EDID (1 << 1) diff --git a/Kernel/init.cpp b/Kernel/init.cpp index b0a5b96927..65d737c73e 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #include #include