Kernel: Move devices into Kernel/Devices/.

cubiclove · Apr 3, 2019 · ab43658 · ab43658
1 parent 072ea7e
commit ab43658
Show file tree

Hide file tree

Showing 42 changed files with 53 additions and 54 deletions.
diff --git a/Kernel/BlockDevice.cpp b/Kernel/BlockDevice.cpp
diff --git a/Kernel/CharacterDevice.cpp b/Kernel/CharacterDevice.cpp
diff --git a/Kernel/Console.h b/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:

diff --git a/Kernel/BXVGADevice.cpp → Kernel/Devices/BXVGADevice.cpp b/Kernel/BXVGADevice.cpp → 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>

diff --git a/Kernel/BXVGADevice.h → Kernel/Devices/BXVGADevice.h b/Kernel/BXVGADevice.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

diff --git a/Kernel/Devices/BlockDevice.cpp b/Kernel/Devices/BlockDevice.cpp
@@ -0,0 +1,5 @@
+#include <Kernel/Devices/BlockDevice.h>
+
+BlockDevice::~BlockDevice()
+{
+}
diff --git a/Kernel/BlockDevice.h → Kernel/Devices/BlockDevice.h b/Kernel/BlockDevice.h → Kernel/Devices/BlockDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class BlockDevice : public Device {
 public:

diff --git a/Kernel/Devices/CharacterDevice.cpp b/Kernel/Devices/CharacterDevice.cpp
@@ -0,0 +1,5 @@
+#include <Kernel/Devices/CharacterDevice.h>
+
+CharacterDevice::~CharacterDevice()
+{
+}
diff --git a/Kernel/CharacterDevice.h → Kernel/Devices/CharacterDevice.h b/Kernel/CharacterDevice.h → Kernel/Devices/CharacterDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class CharacterDevice : public Device {
 public:

diff --git a/Kernel/Device.cpp → Kernel/Devices/Device.cpp b/Kernel/Device.cpp → Kernel/Devices/Device.cpp
diff --git a/Kernel/Device.h → Kernel/Devices/Device.h b/Kernel/Device.h → Kernel/Devices/Device.h
diff --git a/Kernel/DiskDevice.cpp → Kernel/Devices/DiskDevice.cpp b/Kernel/DiskDevice.cpp → Kernel/Devices/DiskDevice.cpp
@@ -1,4 +1,4 @@
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 
 DiskDevice::DiskDevice()
 {

diff --git a/Kernel/DiskDevice.h → Kernel/Devices/DiskDevice.h b/Kernel/DiskDevice.h → Kernel/Devices/DiskDevice.h
diff --git a/Kernel/FileBackedDiskDevice.cpp → Kernel/Devices/FileBackedDiskDevice.cpp b/Kernel/FileBackedDiskDevice.cpp → 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>
 

diff --git a/Kernel/FileBackedDiskDevice.h → Kernel/Devices/FileBackedDiskDevice.h b/Kernel/FileBackedDiskDevice.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>

diff --git a/Kernel/FullDevice.cpp → Kernel/Devices/FullDevice.cpp b/Kernel/FullDevice.cpp → Kernel/Devices/FullDevice.cpp
diff --git a/Kernel/FullDevice.h → Kernel/Devices/FullDevice.h b/Kernel/FullDevice.h → Kernel/Devices/FullDevice.h
diff --git a/Kernel/IDEDiskDevice.cpp → Kernel/Devices/IDEDiskDevice.cpp b/Kernel/IDEDiskDevice.cpp → Kernel/Devices/IDEDiskDevice.cpp
diff --git a/Kernel/IDEDiskDevice.h → Kernel/Devices/IDEDiskDevice.h b/Kernel/IDEDiskDevice.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 {

diff --git a/Kernel/KeyboardDevice.cpp → Kernel/Devices/KeyboardDevice.cpp b/Kernel/KeyboardDevice.cpp → 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>
 

diff --git a/Kernel/KeyboardDevice.h → Kernel/Devices/KeyboardDevice.h b/Kernel/KeyboardDevice.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"
 

diff --git a/Kernel/NullDevice.cpp → Kernel/Devices/NullDevice.cpp b/Kernel/NullDevice.cpp → Kernel/Devices/NullDevice.cpp
diff --git a/Kernel/NullDevice.h → Kernel/Devices/NullDevice.h b/Kernel/NullDevice.h → Kernel/Devices/NullDevice.h
diff --git a/Kernel/PS2MouseDevice.cpp → Kernel/Devices/PS2MouseDevice.cpp b/Kernel/PS2MouseDevice.cpp → Kernel/Devices/PS2MouseDevice.cpp
diff --git a/Kernel/PS2MouseDevice.h → Kernel/Devices/PS2MouseDevice.h b/Kernel/PS2MouseDevice.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>
 

diff --git a/Kernel/RandomDevice.cpp → Kernel/Devices/RandomDevice.cpp b/Kernel/RandomDevice.cpp → Kernel/Devices/RandomDevice.cpp
diff --git a/Kernel/RandomDevice.h → Kernel/Devices/RandomDevice.h b/Kernel/RandomDevice.h → Kernel/Devices/RandomDevice.h
diff --git a/Kernel/ZeroDevice.cpp → Kernel/Devices/ZeroDevice.cpp b/Kernel/ZeroDevice.cpp → Kernel/Devices/ZeroDevice.cpp
diff --git a/Kernel/ZeroDevice.h → Kernel/Devices/ZeroDevice.h b/Kernel/ZeroDevice.h → Kernel/Devices/ZeroDevice.h
diff --git a/Kernel/FileDescriptor.cpp b/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)

diff --git a/Kernel/FileSystem/FileSystem.h b/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"

diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/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>
 

diff --git a/Kernel/Makefile b/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 \
- Device.o \
- CharacterDevice.o \
- BlockDevice.o \
- NullDevice.o \
- FullDevice.o \
- ZeroDevice.o \
- RandomDevice.o \
+ Devices/DiskDevice.o \
+ Devices/Device.o \
+ Devices/CharacterDevice.o \
+ Devices/BlockDevice.o \
+ Devices/NullDevice.o \
+ Devices/FullDevice.o \
+ Devices/ZeroDevice.o \
+ Devices/RandomDevice.o \
  FileSystem/FileSystem.o \
  FileSystem/DiskBackedFileSystem.o \
  FileSystem/Ext2FileSystem.o \

diff --git a/Kernel/Net/TCPSocket.cpp b/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()
 {

diff --git a/Kernel/Net/UDPSocket.cpp b/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()

diff --git a/Kernel/Process.cpp b/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"

diff --git a/Kernel/TTY/MasterPTY.h b/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;

diff --git a/Kernel/TTY/PTYMultiplexer.h b/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>
 

diff --git a/Kernel/TTY/TTY.h b/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;

diff --git a/Kernel/TTY/VirtualConsole.cpp b/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;

diff --git a/Kernel/TTY/VirtualConsole.h b/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 {

diff --git a/Kernel/init.cpp b/Kernel/init.cpp
@@ -2,27 +2,27 @@
 #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/ZeroDevice.h>
-#include <Kernel/FullDevice.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/NullDevice.h>
+#include <Kernel/Devices/ZeroDevice.h>
+#include <Kernel/Devices/FullDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include "MemoryManager.h"
 #include <Kernel/FileSystem/ProcFS.h>
 #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>