1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00

Kernel: Move VirtIO code into the Bus source folder

The VirtIO code handles functionality related to the VirtIO bus, so it
really should be in the Bus folder.
This commit is contained in:
Liav A 2021-08-13 05:21:19 +03:00 committed by Gunnar Beutner
parent f641cc6470
commit 18eb262157
14 changed files with 23 additions and 23 deletions

View file

@ -5,11 +5,11 @@
*/ */
#include <Kernel/Bus/PCI/IDs.h> #include <Kernel/Bus/PCI/IDs.h>
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Bus/VirtIO/VirtIOConsole.h>
#include <Kernel/Bus/VirtIO/VirtIORNG.h>
#include <Kernel/CommandLine.h> #include <Kernel/CommandLine.h>
#include <Kernel/Sections.h> #include <Kernel/Sections.h>
#include <Kernel/VirtIO/VirtIO.h>
#include <Kernel/VirtIO/VirtIOConsole.h>
#include <Kernel/VirtIO/VirtIORNG.h>
namespace Kernel { namespace Kernel {

View file

@ -9,10 +9,10 @@
#include <AK/NonnullOwnPtrVector.h> #include <AK/NonnullOwnPtrVector.h>
#include <Kernel/Bus/PCI/Access.h> #include <Kernel/Bus/PCI/Access.h>
#include <Kernel/Bus/PCI/Device.h> #include <Kernel/Bus/PCI/Device.h>
#include <Kernel/Bus/VirtIO/VirtIOQueue.h>
#include <Kernel/IO.h> #include <Kernel/IO.h>
#include <Kernel/Interrupts/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Memory/MemoryManager.h> #include <Kernel/Memory/MemoryManager.h>
#include <Kernel/VirtIO/VirtIOQueue.h>
namespace Kernel { namespace Kernel {

View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Bus/VirtIO/VirtIOConsole.h>
#include <Kernel/Sections.h> #include <Kernel/Sections.h>
#include <Kernel/VirtIO/VirtIOConsole.h>
namespace Kernel { namespace Kernel {

View file

@ -7,9 +7,9 @@
#pragma once #pragma once
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Bus/VirtIO/VirtIOConsolePort.h>
#include <Kernel/Memory/RingBuffer.h> #include <Kernel/Memory/RingBuffer.h>
#include <Kernel/VirtIO/VirtIO.h>
#include <Kernel/VirtIO/VirtIOConsolePort.h>
namespace Kernel { namespace Kernel {
class VirtIOConsole class VirtIOConsole

View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/VirtIO/VirtIOConsole.h> #include <Kernel/Bus/VirtIO/VirtIOConsole.h>
#include <Kernel/VirtIO/VirtIOConsolePort.h> #include <Kernel/Bus/VirtIO/VirtIOConsolePort.h>
namespace Kernel { namespace Kernel {

View file

@ -7,10 +7,10 @@
#pragma once #pragma once
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/FileSystem/FileDescription.h> #include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/Memory/RingBuffer.h> #include <Kernel/Memory/RingBuffer.h>
#include <Kernel/VirtIO/VirtIO.h>
namespace Kernel { namespace Kernel {

View file

@ -5,7 +5,7 @@
*/ */
#include <AK/Atomic.h> #include <AK/Atomic.h>
#include <Kernel/VirtIO/VirtIOQueue.h> #include <Kernel/Bus/VirtIO/VirtIOQueue.h>
namespace Kernel { namespace Kernel {

View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Kernel/Bus/VirtIO/VirtIORNG.h>
#include <Kernel/Sections.h> #include <Kernel/Sections.h>
#include <Kernel/VirtIO/VirtIORNG.h>
namespace Kernel { namespace Kernel {

View file

@ -6,9 +6,9 @@
#pragma once #pragma once
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/Random.h> #include <Kernel/Random.h>
#include <Kernel/VirtIO/VirtIO.h>
namespace Kernel { namespace Kernel {

View file

@ -37,6 +37,11 @@ set(KERNEL_SOURCES
Bus/USB/USBManagement.cpp Bus/USB/USBManagement.cpp
Bus/USB/USBPipe.cpp Bus/USB/USBPipe.cpp
Bus/USB/USBTransfer.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 CMOS.cpp
CommandLine.cpp CommandLine.cpp
ConsoleDevice.cpp ConsoleDevice.cpp
@ -270,11 +275,6 @@ set(KERNEL_SOURCES
TimerQueue.cpp TimerQueue.cpp
UBSanitizer.cpp UBSanitizer.cpp
UserOrKernelBuffer.cpp UserOrKernelBuffer.cpp
VirtIO/VirtIO.cpp
VirtIO/VirtIOConsole.cpp
VirtIO/VirtIOConsolePort.cpp
VirtIO/VirtIOQueue.cpp
VirtIO/VirtIORNG.cpp
WaitQueue.cpp WaitQueue.cpp
WorkQueue.cpp WorkQueue.cpp
init.cpp init.cpp

View file

@ -6,10 +6,10 @@
#pragma once #pragma once
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Bus/VirtIO/VirtIOQueue.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/Graphics/VirtIOGPU/GPU.h> #include <Kernel/Graphics/VirtIOGPU/GPU.h>
#include <Kernel/VirtIO/VirtIO.h>
#include <Kernel/VirtIO/VirtIOQueue.h>
namespace Kernel::Graphics::VirtIOGPU { namespace Kernel::Graphics::VirtIOGPU {

View file

@ -8,10 +8,10 @@
#include <AK/BinaryBufferWriter.h> #include <AK/BinaryBufferWriter.h>
#include <AK/DistinctNumeric.h> #include <AK/DistinctNumeric.h>
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/Bus/VirtIO/VirtIOQueue.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/Graphics/VirtIOGPU/Protocol.h> #include <Kernel/Graphics/VirtIOGPU/Protocol.h>
#include <Kernel/VirtIO/VirtIO.h>
#include <Kernel/VirtIO/VirtIOQueue.h>
#define VIRTIO_GPU_F_VIRGL (1 << 0) #define VIRTIO_GPU_F_VIRGL (1 << 0)
#define VIRTIO_GPU_F_EDID (1 << 1) #define VIRTIO_GPU_F_EDID (1 << 1)

View file

@ -14,6 +14,7 @@
#include <Kernel/Bus/PCI/Access.h> #include <Kernel/Bus/PCI/Access.h>
#include <Kernel/Bus/PCI/Initializer.h> #include <Kernel/Bus/PCI/Initializer.h>
#include <Kernel/Bus/USB/USBManagement.h> #include <Kernel/Bus/USB/USBManagement.h>
#include <Kernel/Bus/VirtIO/VirtIO.h>
#include <Kernel/CMOS.h> #include <Kernel/CMOS.h>
#include <Kernel/CommandLine.h> #include <Kernel/CommandLine.h>
#include <Kernel/Devices/FullDevice.h> #include <Kernel/Devices/FullDevice.h>
@ -56,7 +57,6 @@
#include <Kernel/Tasks/FinalizerTask.h> #include <Kernel/Tasks/FinalizerTask.h>
#include <Kernel/Tasks/SyncTask.h> #include <Kernel/Tasks/SyncTask.h>
#include <Kernel/Time/TimeManagement.h> #include <Kernel/Time/TimeManagement.h>
#include <Kernel/VirtIO/VirtIO.h>
#include <Kernel/WorkQueue.h> #include <Kernel/WorkQueue.h>
#include <Kernel/kstdio.h> #include <Kernel/kstdio.h>