system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Liav A. 2024-03-01 12:59:32 +02:00 committed by Andrew Kaster
parent cb558f4459
commit bbb749ab47
7 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Bus/VirtIO/Transport/PCIe/Detect.cpp
View file

@ -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 {

4
Kernel/CMakeLists.txt
View file

@ -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

2
Kernel/Bus/VirtIO/Console.cpp → Kernel/Devices/Serial/VirtIO/Console.cpp
View file

@ -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>

2
Kernel/Bus/VirtIO/Console.h → Kernel/Devices/Serial/VirtIO/Console.h
View file

@ -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 {

4
Kernel/Bus/VirtIO/ConsolePort.cpp → Kernel/Devices/Serial/VirtIO/ConsolePort.cpp
View file

@ -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 {

0
Kernel/Bus/VirtIO/ConsolePort.h → Kernel/Devices/Serial/VirtIO/ConsolePort.h
View file

5
Meta/gn/secondary/Kernel/BUILD.gn
View file

@ -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",