From 4617c05a08a41ad8c478b10ad27601fedd6ccb62 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Sat, 18 Mar 2023 13:17:13 +0200
Subject: [PATCH] Kernel: Move a bunch of generic devices code into new
 subdirectory

---
 Kernel/Arch/init.cpp                             | 14 +++++++-------
 Kernel/CMakeLists.txt                            | 16 ++++++++--------
 Kernel/Devices/Audio/Channel.cpp                 |  2 +-
 Kernel/Devices/DeviceManagement.h                |  6 +++---
 Kernel/Devices/{ => Generic}/ConsoleDevice.cpp   |  2 +-
 Kernel/Devices/{ => Generic}/ConsoleDevice.h     |  0
 .../{ => Generic}/DeviceControlDevice.cpp        |  2 +-
 .../Devices/{ => Generic}/DeviceControlDevice.h  |  0
 Kernel/Devices/{ => Generic}/FullDevice.cpp      |  2 +-
 Kernel/Devices/{ => Generic}/FullDevice.h        |  0
 Kernel/Devices/{ => Generic}/MemoryDevice.cpp    |  2 +-
 Kernel/Devices/{ => Generic}/MemoryDevice.h      |  0
 Kernel/Devices/{ => Generic}/NullDevice.cpp      |  2 +-
 Kernel/Devices/{ => Generic}/NullDevice.h        |  0
 Kernel/Devices/{ => Generic}/RandomDevice.cpp    |  2 +-
 Kernel/Devices/{ => Generic}/RandomDevice.h      |  0
 Kernel/Devices/{ => Generic}/SelfTTYDevice.cpp   |  2 +-
 Kernel/Devices/{ => Generic}/SelfTTYDevice.h     |  0
 Kernel/Devices/{ => Generic}/ZeroDevice.cpp      |  2 +-
 Kernel/Devices/{ => Generic}/ZeroDevice.h        |  0
 .../FileSystem/SysFS/Subsystems/Kernel/Log.cpp   |  2 +-
 Kernel/Net/TCPSocket.cpp                         |  2 +-
 Kernel/Net/UDPSocket.cpp                         |  2 +-
 Kernel/Process.cpp                               |  2 +-
 Kernel/Random.cpp                                |  2 +-
 Kernel/TTY/VirtualConsole.h                      |  2 +-
 Kernel/kprintf.cpp                               |  2 +-
 27 files changed, 34 insertions(+), 34 deletions(-)
 rename Kernel/Devices/{ => Generic}/ConsoleDevice.cpp (97%)
 rename Kernel/Devices/{ => Generic}/ConsoleDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/DeviceControlDevice.cpp (96%)
 rename Kernel/Devices/{ => Generic}/DeviceControlDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/FullDevice.cpp (95%)
 rename Kernel/Devices/{ => Generic}/FullDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/MemoryDevice.cpp (98%)
 rename Kernel/Devices/{ => Generic}/MemoryDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/NullDevice.cpp (95%)
 rename Kernel/Devices/{ => Generic}/NullDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/RandomDevice.cpp (96%)
 rename Kernel/Devices/{ => Generic}/RandomDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/SelfTTYDevice.cpp (97%)
 rename Kernel/Devices/{ => Generic}/SelfTTYDevice.h (100%)
 rename Kernel/Devices/{ => Generic}/ZeroDevice.cpp (95%)
 rename Kernel/Devices/{ => Generic}/ZeroDevice.h (100%)

diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index 079453e712..d69d101bef 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -14,18 +14,18 @@
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Audio/Management.h>
-#include <Kernel/Devices/DeviceControlDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/FullDevice.h>
+#include <Kernel/Devices/Generic/DeviceControlDevice.h>
+#include <Kernel/Devices/Generic/FullDevice.h>
+#include <Kernel/Devices/Generic/MemoryDevice.h>
+#include <Kernel/Devices/Generic/NullDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
+#include <Kernel/Devices/Generic/SelfTTYDevice.h>
+#include <Kernel/Devices/Generic/ZeroDevice.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Devices/KCOVDevice.h>
-#include <Kernel/Devices/MemoryDevice.h>
-#include <Kernel/Devices/NullDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
-#include <Kernel/Devices/RandomDevice.h>
-#include <Kernel/Devices/SelfTTYDevice.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/Devices/ZeroDevice.h>
 #include <Kernel/FileSystem/SysFS/Registry.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 1c65479f83..cdbd99f8e1 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -55,23 +55,23 @@ set(KERNEL_SOURCES
     Devices/Audio/Management.cpp
     Devices/BlockDevice.cpp
     Devices/CharacterDevice.cpp
-    Devices/ConsoleDevice.cpp
     Devices/Device.cpp
-    Devices/DeviceControlDevice.cpp
     Devices/DeviceManagement.cpp
-    Devices/FullDevice.cpp
     Devices/KCOVDevice.cpp
     Devices/KCOVInstance.cpp
-    Devices/MemoryDevice.cpp
-    Devices/NullDevice.cpp
     Devices/PCISerialDevice.cpp
-    Devices/RandomDevice.cpp
-    Devices/SelfTTYDevice.cpp
     Devices/SerialDevice.cpp
-    Devices/ZeroDevice.cpp
     Devices/HID/KeyboardDevice.cpp
     Devices/HID/Management.cpp
     Devices/HID/MouseDevice.cpp
+    Devices/Generic/ConsoleDevice.cpp
+    Devices/Generic/DeviceControlDevice.cpp
+    Devices/Generic/FullDevice.cpp
+    Devices/Generic/MemoryDevice.cpp
+    Devices/Generic/NullDevice.cpp
+    Devices/Generic/RandomDevice.cpp
+    Devices/Generic/SelfTTYDevice.cpp
+    Devices/Generic/ZeroDevice.cpp
     Graphics/Bochs/GraphicsAdapter.cpp
     Graphics/Bochs/QEMUDisplayConnector.cpp
     Graphics/Console/BootFramebufferConsole.cpp
diff --git a/Kernel/Devices/Audio/Channel.cpp b/Kernel/Devices/Audio/Channel.cpp
index 96c412f4f0..c76afd4199 100644
--- a/Kernel/Devices/Audio/Channel.cpp
+++ b/Kernel/Devices/Audio/Channel.cpp
@@ -7,7 +7,7 @@
 #include <Kernel/API/Ioctl.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/RandomDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Devices/DeviceManagement.h b/Kernel/Devices/DeviceManagement.h
index 805639d949..91502fe3a3 100644
--- a/Kernel/Devices/DeviceManagement.h
+++ b/Kernel/Devices/DeviceManagement.h
@@ -14,10 +14,10 @@
 #include <Kernel/API/TimePage.h>
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/Device.h>
-#include <Kernel/Devices/DeviceControlDevice.h>
-#include <Kernel/Devices/NullDevice.h>
+#include <Kernel/Devices/Generic/ConsoleDevice.h>
+#include <Kernel/Devices/Generic/DeviceControlDevice.h>
+#include <Kernel/Devices/Generic/NullDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/UnixTypes.h>
 
diff --git a/Kernel/Devices/ConsoleDevice.cpp b/Kernel/Devices/Generic/ConsoleDevice.cpp
similarity index 97%
rename from Kernel/Devices/ConsoleDevice.cpp
rename to Kernel/Devices/Generic/ConsoleDevice.cpp
index c68c8fe1ff..541d2f6956 100644
--- a/Kernel/Devices/ConsoleDevice.cpp
+++ b/Kernel/Devices/Generic/ConsoleDevice.cpp
@@ -8,8 +8,8 @@
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/BochsDebugOutput.h>
 #endif
-#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Sections.h>
 #include <Kernel/kstdio.h>
diff --git a/Kernel/Devices/ConsoleDevice.h b/Kernel/Devices/Generic/ConsoleDevice.h
similarity index 100%
rename from Kernel/Devices/ConsoleDevice.h
rename to Kernel/Devices/Generic/ConsoleDevice.h
diff --git a/Kernel/Devices/DeviceControlDevice.cpp b/Kernel/Devices/Generic/DeviceControlDevice.cpp
similarity index 96%
rename from Kernel/Devices/DeviceControlDevice.cpp
rename to Kernel/Devices/Generic/DeviceControlDevice.cpp
index 59f5f569f6..9d6b2c273e 100644
--- a/Kernel/Devices/DeviceControlDevice.cpp
+++ b/Kernel/Devices/Generic/DeviceControlDevice.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Devices/DeviceControlDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Generic/DeviceControlDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/DeviceControlDevice.h b/Kernel/Devices/Generic/DeviceControlDevice.h
similarity index 100%
rename from Kernel/Devices/DeviceControlDevice.h
rename to Kernel/Devices/Generic/DeviceControlDevice.h
diff --git a/Kernel/Devices/FullDevice.cpp b/Kernel/Devices/Generic/FullDevice.cpp
similarity index 95%
rename from Kernel/Devices/FullDevice.cpp
rename to Kernel/Devices/Generic/FullDevice.cpp
index 70e5ad8318..344dcc45d9 100644
--- a/Kernel/Devices/FullDevice.cpp
+++ b/Kernel/Devices/Generic/FullDevice.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/FullDevice.h>
+#include <Kernel/Devices/Generic/FullDevice.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/FullDevice.h b/Kernel/Devices/Generic/FullDevice.h
similarity index 100%
rename from Kernel/Devices/FullDevice.h
rename to Kernel/Devices/Generic/FullDevice.h
diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/Generic/MemoryDevice.cpp
similarity index 98%
rename from Kernel/Devices/MemoryDevice.cpp
rename to Kernel/Devices/Generic/MemoryDevice.cpp
index 9b0a06fd86..e718383d13 100644
--- a/Kernel/Devices/MemoryDevice.cpp
+++ b/Kernel/Devices/Generic/MemoryDevice.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/MemoryDevice.h>
+#include <Kernel/Devices/Generic/MemoryDevice.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Devices/MemoryDevice.h b/Kernel/Devices/Generic/MemoryDevice.h
similarity index 100%
rename from Kernel/Devices/MemoryDevice.h
rename to Kernel/Devices/Generic/MemoryDevice.h
diff --git a/Kernel/Devices/NullDevice.cpp b/Kernel/Devices/Generic/NullDevice.cpp
similarity index 95%
rename from Kernel/Devices/NullDevice.cpp
rename to Kernel/Devices/Generic/NullDevice.cpp
index 56e6564427..b82e4ae072 100644
--- a/Kernel/Devices/NullDevice.cpp
+++ b/Kernel/Devices/Generic/NullDevice.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Singleton.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/NullDevice.h>
+#include <Kernel/Devices/Generic/NullDevice.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/NullDevice.h b/Kernel/Devices/Generic/NullDevice.h
similarity index 100%
rename from Kernel/Devices/NullDevice.h
rename to Kernel/Devices/Generic/NullDevice.h
diff --git a/Kernel/Devices/RandomDevice.cpp b/Kernel/Devices/Generic/RandomDevice.cpp
similarity index 96%
rename from Kernel/Devices/RandomDevice.cpp
rename to Kernel/Devices/Generic/RandomDevice.cpp
index 6dc97f48ae..b8f703d796 100644
--- a/Kernel/Devices/RandomDevice.cpp
+++ b/Kernel/Devices/Generic/RandomDevice.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/RandomDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Devices/RandomDevice.h b/Kernel/Devices/Generic/RandomDevice.h
similarity index 100%
rename from Kernel/Devices/RandomDevice.h
rename to Kernel/Devices/Generic/RandomDevice.h
diff --git a/Kernel/Devices/SelfTTYDevice.cpp b/Kernel/Devices/Generic/SelfTTYDevice.cpp
similarity index 97%
rename from Kernel/Devices/SelfTTYDevice.cpp
rename to Kernel/Devices/Generic/SelfTTYDevice.cpp
index ddd3129014..6bf7794aab 100644
--- a/Kernel/Devices/SelfTTYDevice.cpp
+++ b/Kernel/Devices/Generic/SelfTTYDevice.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/SelfTTYDevice.h>
+#include <Kernel/Devices/Generic/SelfTTYDevice.h>
 #include <Kernel/Sections.h>
 #include <Kernel/TTY/TTY.h>
 
diff --git a/Kernel/Devices/SelfTTYDevice.h b/Kernel/Devices/Generic/SelfTTYDevice.h
similarity index 100%
rename from Kernel/Devices/SelfTTYDevice.h
rename to Kernel/Devices/Generic/SelfTTYDevice.h
diff --git a/Kernel/Devices/ZeroDevice.cpp b/Kernel/Devices/Generic/ZeroDevice.cpp
similarity index 95%
rename from Kernel/Devices/ZeroDevice.cpp
rename to Kernel/Devices/Generic/ZeroDevice.cpp
index df674c820e..fa7efc8d51 100644
--- a/Kernel/Devices/ZeroDevice.cpp
+++ b/Kernel/Devices/Generic/ZeroDevice.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/ZeroDevice.h>
+#include <Kernel/Devices/Generic/ZeroDevice.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/ZeroDevice.h b/Kernel/Devices/Generic/ZeroDevice.h
similarity index 100%
rename from Kernel/Devices/ZeroDevice.h
rename to Kernel/Devices/Generic/ZeroDevice.h
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.cpp
index 846e2e76e7..89d3a9d2b5 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Net/TCPSocket.cpp b/Kernel/Net/TCPSocket.cpp
index c42e9c6b65..5f1dc365fe 100644
--- a/Kernel/Net/TCPSocket.cpp
+++ b/Kernel/Net/TCPSocket.cpp
@@ -7,7 +7,7 @@
 #include <AK/Singleton.h>
 #include <AK/Time.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Devices/RandomDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/Locking/MutexProtected.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
diff --git a/Kernel/Net/UDPSocket.cpp b/Kernel/Net/UDPSocket.cpp
index 2372422cc2..0ac9ea8a32 100644
--- a/Kernel/Net/UDPSocket.cpp
+++ b/Kernel/Net/UDPSocket.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/Singleton.h>
-#include <Kernel/Devices/RandomDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Net/UDP.h>
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index ea7fbacc98..5ccb1e370d 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -21,7 +21,7 @@
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/API/POSIX/sys/limits.h>
 #include <Kernel/Arch/PageDirectory.h>
-#include <Kernel/Devices/NullDevice.h>
+#include <Kernel/Devices/Generic/NullDevice.h>
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
diff --git a/Kernel/Random.cpp b/Kernel/Random.cpp
index 8745494a6c..ddbd51d461 100644
--- a/Kernel/Random.cpp
+++ b/Kernel/Random.cpp
@@ -13,7 +13,7 @@
 #elif ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/ASM_wrapper.h>
 #endif
-#include <Kernel/Devices/RandomDevice.h>
+#include <Kernel/Devices/Generic/RandomDevice.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/TimeManagement.h>
diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
index 672e4ea1ca..530b98c1e6 100644
--- a/Kernel/TTY/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -10,7 +10,7 @@
 #include <AK/Noncopyable.h>
 #include <AK/Vector.h>
 #include <Kernel/API/KeyCode.h>
-#include <Kernel/Devices/ConsoleDevice.h>
+#include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/TTY/TTY.h>
diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp
index 5c6f5c3202..8a4491c497 100644
--- a/Kernel/kprintf.cpp
+++ b/Kernel/kprintf.cpp
@@ -11,8 +11,8 @@
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/BochsDebugOutput.h>
 #endif
-#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
 #include <Kernel/Graphics/Console/BootFramebufferConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>