ソースを参照

Kernel: Move a bunch of generic devices code into new subdirectory

Liav A 2 年 前
コミット
4617c05a08

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

+ 8 - 8
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

+ 1 - 1
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>
 

+ 3 - 3
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>
 

+ 1 - 1
Kernel/Devices/ConsoleDevice.cpp → 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>

+ 0 - 0
Kernel/Devices/ConsoleDevice.h → Kernel/Devices/Generic/ConsoleDevice.h


+ 1 - 1
Kernel/Devices/DeviceControlDevice.cpp → 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 {
 

+ 0 - 0
Kernel/Devices/DeviceControlDevice.h → Kernel/Devices/Generic/DeviceControlDevice.h


+ 1 - 1
Kernel/Devices/FullDevice.cpp → 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 {

+ 0 - 0
Kernel/Devices/FullDevice.h → Kernel/Devices/Generic/FullDevice.h


+ 1 - 1
Kernel/Devices/MemoryDevice.cpp → 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>

+ 0 - 0
Kernel/Devices/MemoryDevice.h → Kernel/Devices/Generic/MemoryDevice.h


+ 1 - 1
Kernel/Devices/NullDevice.cpp → 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 {

+ 0 - 0
Kernel/Devices/NullDevice.h → Kernel/Devices/Generic/NullDevice.h


+ 1 - 1
Kernel/Devices/RandomDevice.cpp → 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>
 

+ 0 - 0
Kernel/Devices/RandomDevice.h → Kernel/Devices/Generic/RandomDevice.h


+ 1 - 1
Kernel/Devices/SelfTTYDevice.cpp → 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>
 

+ 0 - 0
Kernel/Devices/SelfTTYDevice.h → Kernel/Devices/Generic/SelfTTYDevice.h


+ 1 - 1
Kernel/Devices/ZeroDevice.cpp → 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 {

+ 0 - 0
Kernel/Devices/ZeroDevice.h → Kernel/Devices/Generic/ZeroDevice.h


+ 1 - 1
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>
 

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>