diff options
author | Liav A <liavalb@gmail.com> | 2021-08-27 12:24:50 +0300 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-08-31 16:51:13 +0200 |
commit | 01ae6147274e210a157f83856d290e8b1cfbb73f (patch) | |
tree | 6d2602a49dd1d616d41183635c30baa7d59d5b5e | |
parent | e418740645c2ac28d725c859ba07df0d76b3aab8 (diff) | |
download | serenity-01ae6147274e210a157f83856d290e8b1cfbb73f.zip |
Kernel/VirtIO: Remove redundant VirtIO word from filenames
Now that all related VirtIO classes are in the VirtIO namespace, let's
just remove the redundant VirtIO word from filenames.
-rw-r--r-- | Kernel/Bus/VirtIO/Console.cpp (renamed from Kernel/Bus/VirtIO/VirtIOConsole.cpp) | 2 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/Console.h (renamed from Kernel/Bus/VirtIO/VirtIOConsole.h) | 4 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/ConsolePort.cpp (renamed from Kernel/Bus/VirtIO/VirtIOConsolePort.cpp) | 4 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/ConsolePort.h (renamed from Kernel/Bus/VirtIO/VirtIOConsolePort.h) | 2 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/Device.cpp (renamed from Kernel/Bus/VirtIO/VirtIO.cpp) | 6 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/Device.h (renamed from Kernel/Bus/VirtIO/VirtIO.h) | 2 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/Queue.cpp (renamed from Kernel/Bus/VirtIO/VirtIOQueue.cpp) | 2 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/Queue.h (renamed from Kernel/Bus/VirtIO/VirtIOQueue.h) | 0 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/RNG.cpp (renamed from Kernel/Bus/VirtIO/VirtIORNG.cpp) | 2 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/RNG.h (renamed from Kernel/Bus/VirtIO/VirtIORNG.h) | 2 | ||||
-rw-r--r-- | Kernel/CMakeLists.txt | 10 | ||||
-rw-r--r-- | Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h | 4 | ||||
-rw-r--r-- | Kernel/Graphics/VirtIOGPU/GPU.h | 4 | ||||
-rw-r--r-- | Kernel/init.cpp | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/Kernel/Bus/VirtIO/VirtIOConsole.cpp b/Kernel/Bus/VirtIO/Console.cpp index 4b3fb59391..ab6d3b02ef 100644 --- a/Kernel/Bus/VirtIO/VirtIOConsole.cpp +++ b/Kernel/Bus/VirtIO/Console.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include <Kernel/Bus/VirtIO/VirtIOConsole.h> +#include <Kernel/Bus/VirtIO/Console.h> #include <Kernel/Sections.h> namespace Kernel::VirtIO { diff --git a/Kernel/Bus/VirtIO/VirtIOConsole.h b/Kernel/Bus/VirtIO/Console.h index 6874a7beed..a9bb01cb50 100644 --- a/Kernel/Bus/VirtIO/VirtIOConsole.h +++ b/Kernel/Bus/VirtIO/Console.h @@ -7,8 +7,8 @@ #pragma once -#include <Kernel/Bus/VirtIO/VirtIO.h> -#include <Kernel/Bus/VirtIO/VirtIOConsolePort.h> +#include <Kernel/Bus/VirtIO/ConsolePort.h> +#include <Kernel/Bus/VirtIO/Device.h> #include <Kernel/Memory/RingBuffer.h> namespace Kernel::VirtIO { diff --git a/Kernel/Bus/VirtIO/VirtIOConsolePort.cpp b/Kernel/Bus/VirtIO/ConsolePort.cpp index 1d4749842a..d9e9cb92c9 100644 --- a/Kernel/Bus/VirtIO/VirtIOConsolePort.cpp +++ b/Kernel/Bus/VirtIO/ConsolePort.cpp @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include <Kernel/Bus/VirtIO/VirtIOConsole.h> -#include <Kernel/Bus/VirtIO/VirtIOConsolePort.h> +#include <Kernel/Bus/VirtIO/Console.h> +#include <Kernel/Bus/VirtIO/ConsolePort.h> namespace Kernel::VirtIO { diff --git a/Kernel/Bus/VirtIO/VirtIOConsolePort.h b/Kernel/Bus/VirtIO/ConsolePort.h index d2b9709bb3..ac234730cf 100644 --- a/Kernel/Bus/VirtIO/VirtIOConsolePort.h +++ b/Kernel/Bus/VirtIO/ConsolePort.h @@ -7,7 +7,7 @@ #pragma once -#include <Kernel/Bus/VirtIO/VirtIO.h> +#include <Kernel/Bus/VirtIO/Device.h> #include <Kernel/Devices/CharacterDevice.h> #include <Kernel/FileSystem/FileDescription.h> #include <Kernel/Memory/RingBuffer.h> diff --git a/Kernel/Bus/VirtIO/VirtIO.cpp b/Kernel/Bus/VirtIO/Device.cpp index 3f2148a0ad..dbf78073bb 100644 --- a/Kernel/Bus/VirtIO/VirtIO.cpp +++ b/Kernel/Bus/VirtIO/Device.cpp @@ -5,9 +5,9 @@ */ #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/Bus/VirtIO/Console.h> +#include <Kernel/Bus/VirtIO/Device.h> +#include <Kernel/Bus/VirtIO/RNG.h> #include <Kernel/CommandLine.h> #include <Kernel/Sections.h> diff --git a/Kernel/Bus/VirtIO/VirtIO.h b/Kernel/Bus/VirtIO/Device.h index 2e2025a8c8..5db758f950 100644 --- a/Kernel/Bus/VirtIO/VirtIO.h +++ b/Kernel/Bus/VirtIO/Device.h @@ -9,7 +9,7 @@ #include <AK/NonnullOwnPtrVector.h> #include <Kernel/Bus/PCI/Access.h> #include <Kernel/Bus/PCI/Device.h> -#include <Kernel/Bus/VirtIO/VirtIOQueue.h> +#include <Kernel/Bus/VirtIO/Queue.h> #include <Kernel/IO.h> #include <Kernel/Interrupts/IRQHandler.h> #include <Kernel/Memory/MemoryManager.h> diff --git a/Kernel/Bus/VirtIO/VirtIOQueue.cpp b/Kernel/Bus/VirtIO/Queue.cpp index 69977460eb..33c54bd522 100644 --- a/Kernel/Bus/VirtIO/VirtIOQueue.cpp +++ b/Kernel/Bus/VirtIO/Queue.cpp @@ -5,7 +5,7 @@ */ #include <AK/Atomic.h> -#include <Kernel/Bus/VirtIO/VirtIOQueue.h> +#include <Kernel/Bus/VirtIO/Queue.h> namespace Kernel::VirtIO { diff --git a/Kernel/Bus/VirtIO/VirtIOQueue.h b/Kernel/Bus/VirtIO/Queue.h index 5ff8fd0e4f..5ff8fd0e4f 100644 --- a/Kernel/Bus/VirtIO/VirtIOQueue.h +++ b/Kernel/Bus/VirtIO/Queue.h diff --git a/Kernel/Bus/VirtIO/VirtIORNG.cpp b/Kernel/Bus/VirtIO/RNG.cpp index 71f46aa9c3..b4db822d9b 100644 --- a/Kernel/Bus/VirtIO/VirtIORNG.cpp +++ b/Kernel/Bus/VirtIO/RNG.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include <Kernel/Bus/VirtIO/VirtIORNG.h> +#include <Kernel/Bus/VirtIO/RNG.h> #include <Kernel/Sections.h> namespace Kernel::VirtIO { diff --git a/Kernel/Bus/VirtIO/VirtIORNG.h b/Kernel/Bus/VirtIO/RNG.h index b34b693ea1..ea4e8c775d 100644 --- a/Kernel/Bus/VirtIO/VirtIORNG.h +++ b/Kernel/Bus/VirtIO/RNG.h @@ -7,7 +7,7 @@ #pragma once #include <AK/RefCounted.h> -#include <Kernel/Bus/VirtIO/VirtIO.h> +#include <Kernel/Bus/VirtIO/Device.h> #include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Random.h> diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 65e35c1c9b..4fbfe45109 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -41,11 +41,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 + Bus/VirtIO/Console.cpp + Bus/VirtIO/ConsolePort.cpp + Bus/VirtIO/Device.cpp + Bus/VirtIO/Queue.cpp + Bus/VirtIO/RNG.cpp CMOS.cpp CommandLine.cpp ConsoleDevice.cpp diff --git a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h b/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h index 588d2f3ce1..5381432f04 100644 --- a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h +++ b/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h @@ -6,8 +6,8 @@ #pragma once -#include <Kernel/Bus/VirtIO/VirtIO.h> -#include <Kernel/Bus/VirtIO/VirtIOQueue.h> +#include <Kernel/Bus/VirtIO/Device.h> +#include <Kernel/Bus/VirtIO/Queue.h> #include <Kernel/Devices/BlockDevice.h> #include <Kernel/Graphics/VirtIOGPU/GPU.h> diff --git a/Kernel/Graphics/VirtIOGPU/GPU.h b/Kernel/Graphics/VirtIOGPU/GPU.h index ae3f901c6e..de56a8fa8a 100644 --- a/Kernel/Graphics/VirtIOGPU/GPU.h +++ b/Kernel/Graphics/VirtIOGPU/GPU.h @@ -8,8 +8,8 @@ #include <AK/BinaryBufferWriter.h> #include <AK/DistinctNumeric.h> -#include <Kernel/Bus/VirtIO/VirtIO.h> -#include <Kernel/Bus/VirtIO/VirtIOQueue.h> +#include <Kernel/Bus/VirtIO/Device.h> +#include <Kernel/Bus/VirtIO/Queue.h> #include <Kernel/Devices/BlockDevice.h> #include <Kernel/Graphics/VirtIOGPU/Protocol.h> diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 9237a08266..1da79c63c9 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -14,7 +14,7 @@ #include <Kernel/Bus/PCI/Access.h> #include <Kernel/Bus/PCI/Initializer.h> #include <Kernel/Bus/USB/USBManagement.h> -#include <Kernel/Bus/VirtIO/VirtIO.h> +#include <Kernel/Bus/VirtIO/Device.h> #include <Kernel/CMOS.h> #include <Kernel/CommandLine.h> #include <Kernel/Devices/FullDevice.h> |