Kernel: Move devices into Kernel/Devices/.

Kernel/BlockDevice.cpp

@@ -1,5 +0,0 @@
-#include <Kernel/BlockDevice.h>
-
-BlockDevice::~BlockDevice()
-{
-}

Kernel/CharacterDevice.cpp

@@ -1,5 +0,0 @@
-#include <Kernel/CharacterDevice.h>
-
-CharacterDevice::~CharacterDevice()
-{
-}

Kernel/Console.h

@@ -2,7 +2,7 @@
 
 #include <AK/CircularQueue.h>
 #include <AK/Vector.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 
 class ConsoleImplementation {
 public:

Kernel/Devices/BXVGADevice.cpp

@@ -1,4 +1,4 @@
-#include <Kernel/BXVGADevice.h>
+#include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/IO.h>
 #include <Kernel/PCI.h>
 #include <Kernel/MemoryManager.h>

Kernel/Devices/BXVGADevice.h

@@ -4,7 +4,7 @@
 #include <AK/AKString.h>
 #include <SharedGraphics/Size.h>
 #include <Kernel/types.h>
-#include <Kernel/BlockDevice.h>
+#include <Kernel/Devices/BlockDevice.h>
 
 class BXVGADevice final : public BlockDevice {
     AK_MAKE_ETERNAL

Kernel/Devices/BlockDevice.cpp

@@ -0,0 +1,5 @@
+#include <Kernel/Devices/BlockDevice.h>
+
+BlockDevice::~BlockDevice()
+{
+}

Kernel/Devices/BlockDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class BlockDevice : public Device {
 public:

Kernel/Devices/CharacterDevice.cpp

@@ -0,0 +1,5 @@
+#include <Kernel/Devices/CharacterDevice.h>
+
+CharacterDevice::~CharacterDevice()
+{
+}

Kernel/Devices/CharacterDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class CharacterDevice : public Device {
 public:

Kernel/Devices/DiskDevice.cpp

@@ -1,4 +1,4 @@
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 
 DiskDevice::DiskDevice()
 {

Kernel/Devices/FileBackedDiskDevice.cpp

@@ -1,6 +1,6 @@
 #define _FILE_OFFSET_BITS 64
 
-#include "FileBackedDiskDevice.h"
+#include <Kernel/Devices/FileBackedDiskDevice.h>
 #include <cstring>
 #include <sys/stat.h>
 

Kernel/Devices/FileBackedDiskDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 #include <AK/RetainPtr.h>
 #include <AK/AKString.h>
 #include <AK/Types.h>

Kernel/Devices/IDEDiskDevice.h

@@ -2,7 +2,7 @@
 
 #include <Kernel/Lock.h>
 #include <AK/RetainPtr.h>
-#include <Kernel/DiskDevice.h>
+#include <Kernel/Devices/DiskDevice.h>
 #include "IRQHandler.h"
 
 class IDEDiskDevice final : public IRQHandler, public DiskDevice {

Kernel/Devices/KeyboardDevice.cpp

@@ -2,7 +2,7 @@
 #include "i386.h"
 #include "IO.h"
 #include "PIC.h"
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include <Kernel/TTY/VirtualConsole.h>
 #include <AK/Assertions.h>
 

Kernel/Devices/KeyboardDevice.h

@@ -3,7 +3,7 @@
 #include <AK/Types.h>
 #include <AK/DoublyLinkedList.h>
 #include <AK/CircularQueue.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include "IRQHandler.h"
 #include "KeyCode.h"
 

Kernel/Devices/PS2MouseDevice.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/MousePacket.h>
 #include <Kernel/IRQHandler.h>
 

Kernel/FileDescriptor.cpp

@@ -1,6 +1,6 @@
 #include "FileDescriptor.h"
 #include <Kernel/FileSystem/FileSystem.h>
-#include "CharacterDevice.h"
+#include <Kernel/Devices/CharacterDevice.h>
 #include <LibC/errno_numbers.h>
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
@@ -9,7 +9,7 @@
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/Socket.h>
 #include <Kernel/Process.h>
-#include <Kernel/BlockDevice.h>
+#include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/MemoryManager.h>
 
 Retained<FileDescriptor> FileDescriptor::create(RetainPtr<Inode>&& inode)

Kernel/FileSystem/FileSystem.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 #include "InodeIdentifier.h"
 #include "InodeMetadata.h"
 #include "Limits.h"

Kernel/FileSystem/VirtualFileSystem.cpp

@@ -3,7 +3,7 @@
 #include "FileSystem.h"
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
-#include "CharacterDevice.h"
+#include <Kernel/Devices/CharacterDevice.h>
 #include <LibC/errno_numbers.h>
 #include <Kernel/Process.h>
 

Kernel/Makefile

@@ -6,11 +6,11 @@ KERNEL_OBJS = \
        Process.o \
        Thread.o \
        i8253.o \
-       KeyboardDevice.o \
+       Devices/KeyboardDevice.o \
        CMOS.o \
        PIC.o \
        Syscall.o \
-       IDEDiskDevice.o \
+       Devices/IDEDiskDevice.o \
        MemoryManager.o \
        Console.o \
        IRQHandler.o \
@@ -28,9 +28,9 @@ KERNEL_OBJS = \
        ELF/ELFLoader.o \
        KSyms.o \
        FileSystem/DevPtsFS.o \
-       BXVGADevice.o \
+       Devices/BXVGADevice.o \
        PCI.o \
-       PS2MouseDevice.o \
+       Devices/PS2MouseDevice.o \
        Socket.o \
        LocalSocket.o \
        Net/IPv4Socket.o \
@@ -44,14 +44,14 @@ KERNEL_OBJS = \
 
 VFS_OBJS = \
     FileSystem/ProcFS.o \
-    DiskDevice.o \
+    Devices/DiskDevice.o \
-    Device.o \
+    Devices/Device.o \
-    CharacterDevice.o \
+    Devices/CharacterDevice.o \
-    BlockDevice.o \
+    Devices/BlockDevice.o \
-    NullDevice.o \
+    Devices/NullDevice.o \
-    FullDevice.o \
+    Devices/FullDevice.o \
-    ZeroDevice.o \
+    Devices/ZeroDevice.o \
-    RandomDevice.o \
+    Devices/RandomDevice.o \
     FileSystem/FileSystem.o \
     FileSystem/DiskBackedFileSystem.o \
     FileSystem/Ext2FileSystem.o \

Kernel/Net/TCPSocket.cpp

@@ -3,7 +3,7 @@
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Process.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 
 Lockable<HashMap<word, TCPSocket*>>& TCPSocket::sockets_by_port()
 {

Kernel/Net/UDPSocket.cpp

@@ -2,7 +2,7 @@
 #include <Kernel/Net/UDP.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Process.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Net/Routing.h>
 
 Lockable<HashMap<word, UDPSocket*>>& UDPSocket::sockets_by_port()

Kernel/Process.cpp

@@ -6,7 +6,7 @@
 #include "system.h"
 #include <Kernel/FileDescriptor.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/NullDevice.h>
+#include <Kernel/Devices/NullDevice.h>
 #include <Kernel/ELF/ELFLoader.h>
 #include "MemoryManager.h"
 #include "i8253.h"

Kernel/TTY/MasterPTY.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/DoubleBuffer.h>
 
 class SlavePTY;

Kernel/TTY/PTYMultiplexer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <AK/Badge.h>
 #include <Kernel/Lock.h>
 

Kernel/TTY/TTY.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DoubleBuffer.h"
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/UnixTypes.h>
 
 class Process;

Kernel/TTY/VirtualConsole.cpp

@@ -3,7 +3,6 @@
 #include "i386.h"
 #include "IO.h"
 #include "StdLib.h"
-#include "KeyboardDevice.h"
 #include <AK/AKString.h>
 
 static byte* s_vga_buffer;

Kernel/TTY/VirtualConsole.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Kernel/TTY/TTY.h>
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include "Console.h"
 
 class VirtualConsole final : public TTY, public KeyboardClient, public ConsoleImplementation {

Kernel/init.cpp

@@ -2,16 +2,16 @@
 #include "kmalloc.h"
 #include "i386.h"
 #include "i8253.h"
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include "Process.h"
 #include "system.h"
 #include "PIC.h"
-#include "IDEDiskDevice.h"
+#include <Kernel/Devices/IDEDiskDevice.h>
 #include "KSyms.h"
-#include <Kernel/NullDevice.h>
+#include <Kernel/Devices/NullDevice.h>
-#include <Kernel/ZeroDevice.h>
+#include <Kernel/Devices/ZeroDevice.h>
-#include <Kernel/FullDevice.h>
+#include <Kernel/Devices/FullDevice.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include "MemoryManager.h"
@@ -19,10 +19,10 @@
 #include "RTC.h"
 #include <Kernel/TTY/VirtualConsole.h>
 #include "Scheduler.h"
-#include "PS2MouseDevice.h"
+#include <Kernel/Devices/PS2MouseDevice.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
-#include "BXVGADevice.h"
+#include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/NetworkTask.h>