From 754037874c692769c703f86bfa7af641e1346139 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 23 Jan 2019 05:13:17 +0100 Subject: [PATCH] Move VFS sources into Kernel/. --- .../CharacterDevice.cpp | 0 .../CharacterDevice.h | 0 Kernel/Console.h | 2 +- .../DiskBackedFileSystem.cpp | 0 .../DiskBackedFileSystem.h | 0 {VirtualFileSystem => Kernel}/DiskDevice.cpp | 0 {VirtualFileSystem => Kernel}/DiskDevice.h | 0 .../Ext2FileSystem.cpp | 0 .../Ext2FileSystem.h | 0 Kernel/FIFO.h | 2 +- .../FileBackedDiskDevice.cpp | 0 .../FileBackedDiskDevice.h | 0 .../FileDescriptor.cpp | 0 .../FileDescriptor.h | 0 {VirtualFileSystem => Kernel}/FileSystem.cpp | 0 {VirtualFileSystem => Kernel}/FileSystem.h | 0 {VirtualFileSystem => Kernel}/FullDevice.cpp | 0 {VirtualFileSystem => Kernel}/FullDevice.h | 0 Kernel/GUIEventDevice.h | 2 +- Kernel/IDEDiskDevice.h | 2 +- .../InodeIdentifier.h | 0 {VirtualFileSystem => Kernel}/InodeMetadata.h | 0 Kernel/Keyboard.h | 2 +- {VirtualFileSystem => Kernel}/Limits.h | 0 Kernel/Makefile | 24 +++++++++---------- Kernel/MasterPTY.h | 2 +- Kernel/MemoryManager.h | 2 +- {VirtualFileSystem => Kernel}/NullDevice.cpp | 0 {VirtualFileSystem => Kernel}/NullDevice.h | 0 Kernel/PS2MouseDevice.h | 2 +- Kernel/PTYMultiplexer.h | 2 +- Kernel/ProcFileSystem.cpp | 2 +- Kernel/ProcFileSystem.h | 2 +- Kernel/Process.cpp | 4 ++-- Kernel/Process.h | 4 ++-- .../RandomDevice.cpp | 0 {VirtualFileSystem => Kernel}/RandomDevice.h | 0 .../SyntheticFileSystem.cpp | 0 .../SyntheticFileSystem.h | 0 Kernel/TTY.h | 4 ++-- {VirtualFileSystem => Kernel}/UnixTypes.h | 0 .../VirtualFileSystem.cpp | 0 .../VirtualFileSystem.h | 0 {VirtualFileSystem => Kernel}/ZeroDevice.cpp | 0 {VirtualFileSystem => Kernel}/ZeroDevice.h | 0 {VirtualFileSystem => Kernel}/ext2_fs.h | 0 {VirtualFileSystem => Kernel}/ext2_types.h | 0 Kernel/init.cpp | 12 +++++----- VirtualFileSystem/.gitignore | 2 -- 49 files changed, 35 insertions(+), 37 deletions(-) rename {VirtualFileSystem => Kernel}/CharacterDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/CharacterDevice.h (100%) rename {VirtualFileSystem => Kernel}/DiskBackedFileSystem.cpp (100%) rename {VirtualFileSystem => Kernel}/DiskBackedFileSystem.h (100%) rename {VirtualFileSystem => Kernel}/DiskDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/DiskDevice.h (100%) rename {VirtualFileSystem => Kernel}/Ext2FileSystem.cpp (100%) rename {VirtualFileSystem => Kernel}/Ext2FileSystem.h (100%) rename {VirtualFileSystem => Kernel}/FileBackedDiskDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/FileBackedDiskDevice.h (100%) rename {VirtualFileSystem => Kernel}/FileDescriptor.cpp (100%) rename {VirtualFileSystem => Kernel}/FileDescriptor.h (100%) rename {VirtualFileSystem => Kernel}/FileSystem.cpp (100%) rename {VirtualFileSystem => Kernel}/FileSystem.h (100%) rename {VirtualFileSystem => Kernel}/FullDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/FullDevice.h (100%) rename {VirtualFileSystem => Kernel}/InodeIdentifier.h (100%) rename {VirtualFileSystem => Kernel}/InodeMetadata.h (100%) rename {VirtualFileSystem => Kernel}/Limits.h (100%) rename {VirtualFileSystem => Kernel}/NullDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/NullDevice.h (100%) rename {VirtualFileSystem => Kernel}/RandomDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/RandomDevice.h (100%) rename {VirtualFileSystem => Kernel}/SyntheticFileSystem.cpp (100%) rename {VirtualFileSystem => Kernel}/SyntheticFileSystem.h (100%) rename {VirtualFileSystem => Kernel}/UnixTypes.h (100%) rename {VirtualFileSystem => Kernel}/VirtualFileSystem.cpp (100%) rename {VirtualFileSystem => Kernel}/VirtualFileSystem.h (100%) rename {VirtualFileSystem => Kernel}/ZeroDevice.cpp (100%) rename {VirtualFileSystem => Kernel}/ZeroDevice.h (100%) rename {VirtualFileSystem => Kernel}/ext2_fs.h (100%) rename {VirtualFileSystem => Kernel}/ext2_types.h (100%) delete mode 100644 VirtualFileSystem/.gitignore diff --git a/VirtualFileSystem/CharacterDevice.cpp b/Kernel/CharacterDevice.cpp similarity index 100% rename from VirtualFileSystem/CharacterDevice.cpp rename to Kernel/CharacterDevice.cpp diff --git a/VirtualFileSystem/CharacterDevice.h b/Kernel/CharacterDevice.h similarity index 100% rename from VirtualFileSystem/CharacterDevice.h rename to Kernel/CharacterDevice.h diff --git a/Kernel/Console.h b/Kernel/Console.h index 962ff09aab..683d73f467 100644 --- a/Kernel/Console.h +++ b/Kernel/Console.h @@ -2,7 +2,7 @@ #include #include -#include +#include class ConsoleImplementation { public: diff --git a/VirtualFileSystem/DiskBackedFileSystem.cpp b/Kernel/DiskBackedFileSystem.cpp similarity index 100% rename from VirtualFileSystem/DiskBackedFileSystem.cpp rename to Kernel/DiskBackedFileSystem.cpp diff --git a/VirtualFileSystem/DiskBackedFileSystem.h b/Kernel/DiskBackedFileSystem.h similarity index 100% rename from VirtualFileSystem/DiskBackedFileSystem.h rename to Kernel/DiskBackedFileSystem.h diff --git a/VirtualFileSystem/DiskDevice.cpp b/Kernel/DiskDevice.cpp similarity index 100% rename from VirtualFileSystem/DiskDevice.cpp rename to Kernel/DiskDevice.cpp diff --git a/VirtualFileSystem/DiskDevice.h b/Kernel/DiskDevice.h similarity index 100% rename from VirtualFileSystem/DiskDevice.h rename to Kernel/DiskDevice.h diff --git a/VirtualFileSystem/Ext2FileSystem.cpp b/Kernel/Ext2FileSystem.cpp similarity index 100% rename from VirtualFileSystem/Ext2FileSystem.cpp rename to Kernel/Ext2FileSystem.cpp diff --git a/VirtualFileSystem/Ext2FileSystem.h b/Kernel/Ext2FileSystem.h similarity index 100% rename from VirtualFileSystem/Ext2FileSystem.h rename to Kernel/Ext2FileSystem.h diff --git a/Kernel/FIFO.h b/Kernel/FIFO.h index 30a5bd33df..fbe1a4157e 100644 --- a/Kernel/FIFO.h +++ b/Kernel/FIFO.h @@ -3,7 +3,7 @@ #include "DoubleBuffer.h" #include #include -#include +#include class FIFO : public Retainable { public: diff --git a/VirtualFileSystem/FileBackedDiskDevice.cpp b/Kernel/FileBackedDiskDevice.cpp similarity index 100% rename from VirtualFileSystem/FileBackedDiskDevice.cpp rename to Kernel/FileBackedDiskDevice.cpp diff --git a/VirtualFileSystem/FileBackedDiskDevice.h b/Kernel/FileBackedDiskDevice.h similarity index 100% rename from VirtualFileSystem/FileBackedDiskDevice.h rename to Kernel/FileBackedDiskDevice.h diff --git a/VirtualFileSystem/FileDescriptor.cpp b/Kernel/FileDescriptor.cpp similarity index 100% rename from VirtualFileSystem/FileDescriptor.cpp rename to Kernel/FileDescriptor.cpp diff --git a/VirtualFileSystem/FileDescriptor.h b/Kernel/FileDescriptor.h similarity index 100% rename from VirtualFileSystem/FileDescriptor.h rename to Kernel/FileDescriptor.h diff --git a/VirtualFileSystem/FileSystem.cpp b/Kernel/FileSystem.cpp similarity index 100% rename from VirtualFileSystem/FileSystem.cpp rename to Kernel/FileSystem.cpp diff --git a/VirtualFileSystem/FileSystem.h b/Kernel/FileSystem.h similarity index 100% rename from VirtualFileSystem/FileSystem.h rename to Kernel/FileSystem.h diff --git a/VirtualFileSystem/FullDevice.cpp b/Kernel/FullDevice.cpp similarity index 100% rename from VirtualFileSystem/FullDevice.cpp rename to Kernel/FullDevice.cpp diff --git a/VirtualFileSystem/FullDevice.h b/Kernel/FullDevice.h similarity index 100% rename from VirtualFileSystem/FullDevice.h rename to Kernel/FullDevice.h diff --git a/Kernel/GUIEventDevice.h b/Kernel/GUIEventDevice.h index 6fe7dfd314..d1f6b20b52 100644 --- a/Kernel/GUIEventDevice.h +++ b/Kernel/GUIEventDevice.h @@ -1,6 +1,6 @@ #pragma once -#include +#include class GUIEventDevice final : public CharacterDevice { public: diff --git a/Kernel/IDEDiskDevice.h b/Kernel/IDEDiskDevice.h index 6db024bb95..2e3fe509e9 100644 --- a/Kernel/IDEDiskDevice.h +++ b/Kernel/IDEDiskDevice.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include "IRQHandler.h" class IDEDiskDevice final : public IRQHandler, public DiskDevice { diff --git a/VirtualFileSystem/InodeIdentifier.h b/Kernel/InodeIdentifier.h similarity index 100% rename from VirtualFileSystem/InodeIdentifier.h rename to Kernel/InodeIdentifier.h diff --git a/VirtualFileSystem/InodeMetadata.h b/Kernel/InodeMetadata.h similarity index 100% rename from VirtualFileSystem/InodeMetadata.h rename to Kernel/InodeMetadata.h diff --git a/Kernel/Keyboard.h b/Kernel/Keyboard.h index 1bea052e75..614a66cd31 100644 --- a/Kernel/Keyboard.h +++ b/Kernel/Keyboard.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "IRQHandler.h" class KeyboardClient; diff --git a/VirtualFileSystem/Limits.h b/Kernel/Limits.h similarity index 100% rename from VirtualFileSystem/Limits.h rename to Kernel/Limits.h diff --git a/Kernel/Makefile b/Kernel/Makefile index e5fe2846a1..8215dcb8bc 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -33,18 +33,18 @@ KERNEL_OBJS = \ GUIEventDevice.o VFS_OBJS = \ - ../VirtualFileSystem/DiskDevice.o \ - ../VirtualFileSystem/CharacterDevice.o \ - ../VirtualFileSystem/NullDevice.o \ - ../VirtualFileSystem/FullDevice.o \ - ../VirtualFileSystem/ZeroDevice.o \ - ../VirtualFileSystem/RandomDevice.o \ - ../VirtualFileSystem/FileSystem.o \ - ../VirtualFileSystem/DiskBackedFileSystem.o \ - ../VirtualFileSystem/Ext2FileSystem.o \ - ../VirtualFileSystem/VirtualFileSystem.o \ - ../VirtualFileSystem/FileDescriptor.o \ - ../VirtualFileSystem/SyntheticFileSystem.o + DiskDevice.o \ + CharacterDevice.o \ + NullDevice.o \ + FullDevice.o \ + ZeroDevice.o \ + RandomDevice.o \ + FileSystem.o \ + DiskBackedFileSystem.o \ + Ext2FileSystem.o \ + VirtualFileSystem.o \ + FileDescriptor.o \ + SyntheticFileSystem.o SHAREDGRAPHICS_OBJS = \ ../SharedGraphics/Rect.o \ diff --git a/Kernel/MasterPTY.h b/Kernel/MasterPTY.h index 7c85dfea56..c7ba83ba2b 100644 --- a/Kernel/MasterPTY.h +++ b/Kernel/MasterPTY.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "DoubleBuffer.h" class SlavePTY; diff --git a/Kernel/MemoryManager.h b/Kernel/MemoryManager.h index d01c773c99..aa2df1ce80 100644 --- a/Kernel/MemoryManager.h +++ b/Kernel/MemoryManager.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #define PAGE_ROUND_UP(x) ((((dword)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1))) diff --git a/VirtualFileSystem/NullDevice.cpp b/Kernel/NullDevice.cpp similarity index 100% rename from VirtualFileSystem/NullDevice.cpp rename to Kernel/NullDevice.cpp diff --git a/VirtualFileSystem/NullDevice.h b/Kernel/NullDevice.h similarity index 100% rename from VirtualFileSystem/NullDevice.h rename to Kernel/NullDevice.h diff --git a/Kernel/PS2MouseDevice.h b/Kernel/PS2MouseDevice.h index a06975c047..5f616a3933 100644 --- a/Kernel/PS2MouseDevice.h +++ b/Kernel/PS2MouseDevice.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "IRQHandler.h" class PS2MouseDevice final : public IRQHandler, public CharacterDevice { diff --git a/Kernel/PTYMultiplexer.h b/Kernel/PTYMultiplexer.h index bd1afe6a66..44981e4749 100644 --- a/Kernel/PTYMultiplexer.h +++ b/Kernel/PTYMultiplexer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include class MasterPTY; diff --git a/Kernel/ProcFileSystem.cpp b/Kernel/ProcFileSystem.cpp index 37d0b0d2e0..65606929fa 100644 --- a/Kernel/ProcFileSystem.cpp +++ b/Kernel/ProcFileSystem.cpp @@ -1,6 +1,6 @@ #include "ProcFileSystem.h" #include "Process.h" -#include +#include #include "system.h" #include "MemoryManager.h" #include "StdLib.h" diff --git a/Kernel/ProcFileSystem.h b/Kernel/ProcFileSystem.h index 3b0050556f..0f00b8ea96 100644 --- a/Kernel/ProcFileSystem.h +++ b/Kernel/ProcFileSystem.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include class Process; diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 409755b837..fdb1e54745 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -4,8 +4,8 @@ #include "StdLib.h" #include "i386.h" #include "system.h" -#include -#include +#include +#include #include "ELFLoader.h" #include "MemoryManager.h" #include "i8253.h" diff --git a/Kernel/Process.h b/Kernel/Process.h index 7a8dad052e..d58ce0689d 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -6,8 +6,8 @@ #include "TTY.h" #include "Syscall.h" #include "GUITypes.h" -#include -#include +#include +#include #include #include #include diff --git a/VirtualFileSystem/RandomDevice.cpp b/Kernel/RandomDevice.cpp similarity index 100% rename from VirtualFileSystem/RandomDevice.cpp rename to Kernel/RandomDevice.cpp diff --git a/VirtualFileSystem/RandomDevice.h b/Kernel/RandomDevice.h similarity index 100% rename from VirtualFileSystem/RandomDevice.h rename to Kernel/RandomDevice.h diff --git a/VirtualFileSystem/SyntheticFileSystem.cpp b/Kernel/SyntheticFileSystem.cpp similarity index 100% rename from VirtualFileSystem/SyntheticFileSystem.cpp rename to Kernel/SyntheticFileSystem.cpp diff --git a/VirtualFileSystem/SyntheticFileSystem.h b/Kernel/SyntheticFileSystem.h similarity index 100% rename from VirtualFileSystem/SyntheticFileSystem.h rename to Kernel/SyntheticFileSystem.h diff --git a/Kernel/TTY.h b/Kernel/TTY.h index abe06a9141..178b474152 100644 --- a/Kernel/TTY.h +++ b/Kernel/TTY.h @@ -1,8 +1,8 @@ #pragma once #include "DoubleBuffer.h" -#include -#include +#include +#include class Process; diff --git a/VirtualFileSystem/UnixTypes.h b/Kernel/UnixTypes.h similarity index 100% rename from VirtualFileSystem/UnixTypes.h rename to Kernel/UnixTypes.h diff --git a/VirtualFileSystem/VirtualFileSystem.cpp b/Kernel/VirtualFileSystem.cpp similarity index 100% rename from VirtualFileSystem/VirtualFileSystem.cpp rename to Kernel/VirtualFileSystem.cpp diff --git a/VirtualFileSystem/VirtualFileSystem.h b/Kernel/VirtualFileSystem.h similarity index 100% rename from VirtualFileSystem/VirtualFileSystem.h rename to Kernel/VirtualFileSystem.h diff --git a/VirtualFileSystem/ZeroDevice.cpp b/Kernel/ZeroDevice.cpp similarity index 100% rename from VirtualFileSystem/ZeroDevice.cpp rename to Kernel/ZeroDevice.cpp diff --git a/VirtualFileSystem/ZeroDevice.h b/Kernel/ZeroDevice.h similarity index 100% rename from VirtualFileSystem/ZeroDevice.h rename to Kernel/ZeroDevice.h diff --git a/VirtualFileSystem/ext2_fs.h b/Kernel/ext2_fs.h similarity index 100% rename from VirtualFileSystem/ext2_fs.h rename to Kernel/ext2_fs.h diff --git a/VirtualFileSystem/ext2_types.h b/Kernel/ext2_types.h similarity index 100% rename from VirtualFileSystem/ext2_types.h rename to Kernel/ext2_types.h diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 24c9a7d4ed..4df345664e 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -9,12 +9,12 @@ #include "CMOS.h" #include "IDEDiskDevice.h" #include "KSyms.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "GUIEventDevice.h" #include "MemoryManager.h" #include "ProcFileSystem.h" diff --git a/VirtualFileSystem/.gitignore b/VirtualFileSystem/.gitignore deleted file mode 100644 index 499a618326..0000000000 --- a/VirtualFileSystem/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.o -*.swp