diff options
| -rw-r--r-- | kernel/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | kernel/devices/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | kernel/filesystem/CMakeLists.txt | 43 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/block_device.hpp (renamed from kernel/devices/include/devices/block_device.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/device.hpp (renamed from kernel/devices/include/devices/device.hpp) | 0 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp (renamed from kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp (renamed from kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/storage/storage_controller.hpp (renamed from kernel/devices/include/devices/storage/storage_controller.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/devices/storage/storage_management.hpp (renamed from kernel/devices/include/devices/storage/storage_management.hpp) | 4 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/custody.hpp (renamed from kernel/filesystem/include/filesystem/custody.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/device_file.hpp (renamed from kernel/filesystem/include/filesystem/device_file.hpp) | 6 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp (renamed from kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp) | 6 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/file.hpp (renamed from kernel/filesystem/include/filesystem/file.hpp) | 0 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/file_descriptor_table.hpp (renamed from kernel/filesystem/include/filesystem/file_descriptor_table.hpp) | 0 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/filesystem.hpp (renamed from kernel/filesystem/include/filesystem/filesystem.hpp) | 4 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/inode.hpp (renamed from kernel/filesystem/include/filesystem/inode.hpp) | 4 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/inode_file.hpp (renamed from kernel/filesystem/include/filesystem/inode_file.hpp) | 4 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/inode_metadata.hpp (renamed from kernel/filesystem/include/filesystem/inode_metadata.hpp) | 0 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/mount.hpp (renamed from kernel/filesystem/include/filesystem/mount.hpp) | 2 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/open_file_description.hpp (renamed from kernel/filesystem/include/filesystem/open_file_description.hpp) | 0 | ||||
| -rw-r--r-- | kernel/include/kernel/filesystem/vfs.hpp (renamed from kernel/filesystem/include/filesystem/vfs.hpp) | 12 | ||||
| -rw-r--r-- | kernel/src/devices/block_device.cpp (renamed from kernel/devices/src/block_device.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/devices/device.cpp (renamed from kernel/devices/src/device.cpp) | 2 | ||||
| -rw-r--r-- | kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp (renamed from kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/devices/storage/ram_disk/ram_disk_device.cpp (renamed from kernel/devices/src/storage/ram_disk/ram_disk_device.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/devices/storage/storage_controller.cpp (renamed from kernel/devices/src/storage/storage_controller.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/devices/storage/storage_management.cpp (renamed from kernel/devices/src/storage/storage_management.cpp) | 8 | ||||
| -rw-r--r-- | kernel/src/filesystem/custody.cpp (renamed from kernel/filesystem/src/custody.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/device_file.cpp (renamed from kernel/filesystem/src/device_file.cpp) | 6 | ||||
| -rw-r--r-- | kernel/src/filesystem/ext2/ext2_filesystem.cpp (renamed from kernel/filesystem/src/ext2/ext2_filesystem.cpp) | 8 | ||||
| -rw-r--r-- | kernel/src/filesystem/file_descriptor_table.cpp (renamed from kernel/filesystem/src/file_descriptor_table.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/filesystem.cpp (renamed from kernel/filesystem/src/filesystem.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/inode.cpp (renamed from kernel/filesystem/src/inode.cpp) | 6 | ||||
| -rw-r--r-- | kernel/src/filesystem/inode_file.cpp (renamed from kernel/filesystem/src/inode_file.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/mount.cpp (renamed from kernel/filesystem/src/mount.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/open_file_description.cpp (renamed from kernel/filesystem/src/open_file_description.cpp) | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/vfs.cpp (renamed from kernel/filesystem/src/vfs.cpp) | 20 | ||||
| -rw-r--r-- | kernel/src/main.cpp | 10 |
38 files changed, 92 insertions, 155 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 830c527..398022c 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -1,6 +1,3 @@ -add_subdirectory("devices") -add_subdirectory("filesystem") - add_executable("kernel" # Platform-independent KAPI implementation "kapi/boot_modules.cpp" @@ -18,6 +15,22 @@ add_executable("kernel" "src/memory/block_list_allocator.cpp" "src/memory/operators.cpp" "src/memory.cpp" + "src/devices/device.cpp" + "src/devices/block_device.cpp" + "src/devices/storage/storage_controller.cpp" + "src/devices/storage/storage_management.cpp" + "src/devices/storage/ram_disk/ram_disk_controller.cpp" + "src/devices/storage/ram_disk/ram_disk_device.cpp" + "src/filesystem/ext2/ext2_filesystem.cpp" + "src/filesystem/custody.cpp" + "src/filesystem/device_file.cpp" + "src/filesystem/file_descriptor_table.cpp" + "src/filesystem/filesystem.cpp" + "src/filesystem/inode_file.cpp" + "src/filesystem/inode.cpp" + "src/filesystem/mount.cpp" + "src/filesystem/open_file_description.cpp" + "src/filesystem/vfs.cpp" ) target_include_directories("kernel" PRIVATE @@ -27,8 +40,6 @@ target_include_directories("kernel" PRIVATE target_link_libraries("kernel" PRIVATE "os::arch" "os::kapi" - "kernel::devices" - "kernel::filesystem" ) target_link_options("kernel" PRIVATE diff --git a/kernel/devices/CMakeLists.txt b/kernel/devices/CMakeLists.txt deleted file mode 100644 index 15d03fa..0000000 --- a/kernel/devices/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -add_library("kernel_devices" STATIC) -add_library("kernel::devices" ALIAS "kernel_devices") - -target_sources("kernel_devices" PRIVATE - "src/device.cpp" - "src/block_device.cpp" - "src/storage/storage_controller.cpp" - "src/storage/storage_management.cpp" - "src/storage/ram_disk/ram_disk_controller.cpp" - "src/storage/ram_disk/ram_disk_device.cpp" -) - -target_sources("kernel_devices" PUBLIC - FILE_SET HEADERS - BASE_DIRS "include" - FILES - "include/devices/device.hpp" - "include/devices/block_device.hpp" - "include/devices/storage/storage_controller.hpp" - "include/devices/storage/storage_management.hpp" - "include/devices/storage/ram_disk/ram_disk_controller.hpp" - "include/devices/storage/ram_disk/ram_disk_device.hpp" -) - -target_include_directories("kernel_devices" PUBLIC - "include" -) - -target_link_libraries("kernel_devices" PRIVATE - "os::kapi" -)
\ No newline at end of file diff --git a/kernel/filesystem/CMakeLists.txt b/kernel/filesystem/CMakeLists.txt deleted file mode 100644 index bb2090a..0000000 --- a/kernel/filesystem/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -add_library("kernel_filesystem" STATIC) -add_library("kernel::filesystem" ALIAS "kernel_filesystem") - -target_sources("kernel_filesystem" PRIVATE - "src/ext2/ext2_filesystem.cpp" - "src/custody.cpp" - "src/device_file.cpp" - "src/file_descriptor_table.cpp" - "src/filesystem.cpp" - "src/inode_file.cpp" - "src/inode.cpp" - "src/mount.cpp" - "src/open_file_description.cpp" - "src/vfs.cpp" -) - -target_sources("kernel_filesystem" PUBLIC - FILE_SET HEADERS - BASE_DIRS "include" - FILES - "include/filesystem/ext2/ext2_filesystem.hpp" - "include/filesystem/custody.hpp" - "include/filesystem/device_file.hpp" - "include/filesystem/file_descriptor_table.hpp" - "include/filesystem/file.hpp" - "include/filesystem/filesystem.hpp" - "include/filesystem/inode_file.hpp" - "include/filesystem/inode_metadata.hpp" - "include/filesystem/inode.hpp" - "include/filesystem/mount.hpp" - "include/filesystem/open_file_description.hpp" - "include/filesystem/vfs.hpp" -) - -target_include_directories("kernel_filesystem" PUBLIC - "include" -) - -target_link_libraries("kernel_filesystem" PUBLIC - "kernel::devices" -PRIVATE - "os::kapi" -) diff --git a/kernel/devices/include/devices/block_device.hpp b/kernel/include/kernel/devices/block_device.hpp index 4831be5..2a6f061 100644 --- a/kernel/devices/include/devices/block_device.hpp +++ b/kernel/include/kernel/devices/block_device.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP #define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP -#include "devices/device.hpp" +#include "kernel/devices/device.hpp" #include <cstddef> #include <string_view> diff --git a/kernel/devices/include/devices/device.hpp b/kernel/include/kernel/devices/device.hpp index d6f520f..d6f520f 100644 --- a/kernel/devices/include/devices/device.hpp +++ b/kernel/include/kernel/devices/device.hpp diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp index f69f8d8..6f022e3 100644 --- a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp +++ b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp @@ -3,7 +3,7 @@ #include "kapi/boot_module/boot_module_registry.hpp" -#include "devices/storage/storage_controller.hpp" +#include "kernel/devices/storage/storage_controller.hpp" namespace devices::storage::ram_disk { diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp index 1edf48c..c323f4b 100644 --- a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp +++ b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp @@ -3,7 +3,7 @@ #include "kapi/boot_module/boot_module.hpp" -#include "devices/block_device.hpp" +#include "kernel/devices/block_device.hpp" #include <cstddef> diff --git a/kernel/devices/include/devices/storage/storage_controller.hpp b/kernel/include/kernel/devices/storage/storage_controller.hpp index 7760fc9..58585fa 100644 --- a/kernel/devices/include/devices/storage/storage_controller.hpp +++ b/kernel/include/kernel/devices/storage/storage_controller.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP #define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP -#include "devices/device.hpp" +#include "kernel/devices/device.hpp" #include <kstd/memory> #include <kstd/vector> diff --git a/kernel/devices/include/devices/storage/storage_management.hpp b/kernel/include/kernel/devices/storage/storage_management.hpp index f8ffda8..413820e 100644 --- a/kernel/devices/include/devices/storage/storage_management.hpp +++ b/kernel/include/kernel/devices/storage/storage_management.hpp @@ -1,8 +1,8 @@ #ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP #define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP -#include "devices/device.hpp" -#include "devices/storage/storage_controller.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/devices/storage/storage_controller.hpp" #include <kstd/memory> #include <kstd/vector> diff --git a/kernel/filesystem/include/filesystem/custody.hpp b/kernel/include/kernel/filesystem/custody.hpp index 0124eb6..8a0e09a 100644 --- a/kernel/filesystem/include/filesystem/custody.hpp +++ b/kernel/include/kernel/filesystem/custody.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_CUSTODY_HPP #define TEACH_OS_KERNEL_CUSTODY_HPP -#include "filesystem/inode.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/device_file.hpp b/kernel/include/kernel/filesystem/device_file.hpp index dad4ea5..06aa9b2 100644 --- a/kernel/filesystem/include/filesystem/device_file.hpp +++ b/kernel/include/kernel/filesystem/device_file.hpp @@ -1,9 +1,9 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVICE_FILE_HPP #define TEACH_OS_KERNEL_FILESYSTEM_DEVICE_FILE_HPP -#include "devices/block_device.hpp" -#include "devices/device.hpp" -#include "filesystem/file.hpp" +#include "kernel/devices/block_device.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/file.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp b/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp index 37448a1..d6f69c8 100644 --- a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp +++ b/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp @@ -1,9 +1,9 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP #define TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP -#include "devices/device.hpp" -#include "filesystem/filesystem.hpp" -#include "filesystem/inode.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/filesystem.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/file.hpp b/kernel/include/kernel/filesystem/file.hpp index e7e1b12..e7e1b12 100644 --- a/kernel/filesystem/include/filesystem/file.hpp +++ b/kernel/include/kernel/filesystem/file.hpp diff --git a/kernel/filesystem/include/filesystem/file_descriptor_table.hpp b/kernel/include/kernel/filesystem/file_descriptor_table.hpp index 6d78532..6d78532 100644 --- a/kernel/filesystem/include/filesystem/file_descriptor_table.hpp +++ b/kernel/include/kernel/filesystem/file_descriptor_table.hpp diff --git a/kernel/filesystem/include/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp index 934f883..23924c4 100644 --- a/kernel/filesystem/include/filesystem/filesystem.hpp +++ b/kernel/include/kernel/filesystem/filesystem.hpp @@ -1,8 +1,8 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP #define TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP -#include "devices/device.hpp" -#include "filesystem/inode.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/inode.hpp b/kernel/include/kernel/filesystem/inode.hpp index abfe2cf..a2955f9 100644 --- a/kernel/filesystem/include/filesystem/inode.hpp +++ b/kernel/include/kernel/filesystem/inode.hpp @@ -1,8 +1,8 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP #define TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP -#include "devices/device.hpp" -#include "filesystem/inode_metadata.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/inode_metadata.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/inode_file.hpp b/kernel/include/kernel/filesystem/inode_file.hpp index 5f8a95e..ee84eee 100644 --- a/kernel/filesystem/include/filesystem/inode_file.hpp +++ b/kernel/include/kernel/filesystem/inode_file.hpp @@ -1,8 +1,8 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_FILE_HPP #define TEACH_OS_KERNEL_FILESYSTEM_INODE_FILE_HPP -#include "filesystem/file.hpp" -#include "filesystem/inode.hpp" +#include "kernel/filesystem/file.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/inode_metadata.hpp b/kernel/include/kernel/filesystem/inode_metadata.hpp index ed5a09d..ed5a09d 100644 --- a/kernel/filesystem/include/filesystem/inode_metadata.hpp +++ b/kernel/include/kernel/filesystem/inode_metadata.hpp diff --git a/kernel/filesystem/include/filesystem/mount.hpp b/kernel/include/kernel/filesystem/mount.hpp index 46a68e2..232a9be 100644 --- a/kernel/filesystem/include/filesystem/mount.hpp +++ b/kernel/include/kernel/filesystem/mount.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_MOUNT_HPP #define TEACH_OS_KERNEL_FILESYSTEM_MOUNT_HPP -#include "filesystem/filesystem.hpp" +#include "kernel/filesystem/filesystem.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/include/filesystem/open_file_description.hpp b/kernel/include/kernel/filesystem/open_file_description.hpp index 5ff094d..5ff094d 100644 --- a/kernel/filesystem/include/filesystem/open_file_description.hpp +++ b/kernel/include/kernel/filesystem/open_file_description.hpp diff --git a/kernel/filesystem/include/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp index e16a961..a2894a6 100644 --- a/kernel/filesystem/include/filesystem/vfs.hpp +++ b/kernel/include/kernel/filesystem/vfs.hpp @@ -1,12 +1,12 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP #define TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP -#include "devices/device.hpp" -#include "filesystem/custody.hpp" -#include "filesystem/ext2/ext2_filesystem.hpp" -#include "filesystem/inode.hpp" -#include "filesystem/mount.hpp" -#include "filesystem/open_file_description.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/custody.hpp" +#include "kernel/filesystem/ext2/ext2_filesystem.hpp" +#include "kernel/filesystem/inode.hpp" +#include "kernel/filesystem/mount.hpp" +#include "kernel/filesystem/open_file_description.hpp" #include <kstd/memory> #include <kstd/vector> diff --git a/kernel/devices/src/block_device.cpp b/kernel/src/devices/block_device.cpp index 40f842a..d12251b 100644 --- a/kernel/devices/src/block_device.cpp +++ b/kernel/src/devices/block_device.cpp @@ -1,8 +1,8 @@ -#include "devices/block_device.hpp" +#include "kernel/devices/block_device.hpp" #include "kapi/system.hpp" -#include "devices/device.hpp" +#include "kernel/devices/device.hpp" #include <cstddef> #include <string_view> diff --git a/kernel/devices/src/device.cpp b/kernel/src/devices/device.cpp index 8184321..29498fa 100644 --- a/kernel/devices/src/device.cpp +++ b/kernel/src/devices/device.cpp @@ -1,4 +1,4 @@ -#include "devices/device.hpp" +#include "kernel/devices/device.hpp" #include <cstddef> #include <string_view> diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp index 3d14faf..efb6256 100644 --- a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp +++ b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp @@ -1,8 +1,8 @@ -#include "devices/storage/ram_disk/ram_disk_controller.hpp" +#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp" #include "kapi/boot_module/boot_module_registry.hpp" -#include "devices/storage/ram_disk/ram_disk_device.hpp" +#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp" #include <kstd/memory> #include <kstd/print> diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp index 91a278e..650a151 100644 --- a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp +++ b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp @@ -1,9 +1,9 @@ -#include "devices/storage/ram_disk/ram_disk_device.hpp" +#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp" #include "kapi/boot_module/boot_module.hpp" #include "kapi/system.hpp" -#include "devices/block_device.hpp" +#include "kernel/devices/block_device.hpp" #include <kstd/cstring> diff --git a/kernel/devices/src/storage/storage_controller.cpp b/kernel/src/devices/storage/storage_controller.cpp index 16d40f4..e415436 100644 --- a/kernel/devices/src/storage/storage_controller.cpp +++ b/kernel/src/devices/storage/storage_controller.cpp @@ -1,6 +1,6 @@ -#include "devices/storage/storage_controller.hpp" +#include "kernel/devices/storage/storage_controller.hpp" -#include "devices/device.hpp" +#include "kernel/devices/device.hpp" #include <kstd/memory> #include <kstd/vector> diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/src/devices/storage/storage_management.cpp index 25885ad..56216b0 100644 --- a/kernel/devices/src/storage/storage_management.cpp +++ b/kernel/src/devices/storage/storage_management.cpp @@ -1,11 +1,11 @@ -#include "devices/storage/storage_management.hpp" +#include "kernel/devices/storage/storage_management.hpp" #include "kapi/boot_modules.hpp" #include "kapi/system.hpp" -#include "devices/device.hpp" -#include "devices/storage/ram_disk/ram_disk_controller.hpp" -#include "devices/storage/storage_controller.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp" +#include "kernel/devices/storage/storage_controller.hpp" #include <kstd/memory> #include <kstd/vector> diff --git a/kernel/filesystem/src/custody.cpp b/kernel/src/filesystem/custody.cpp index 3a87345..a4dd12c 100644 --- a/kernel/filesystem/src/custody.cpp +++ b/kernel/src/filesystem/custody.cpp @@ -1,8 +1,8 @@ -#include "filesystem/custody.hpp" +#include "kernel/filesystem/custody.hpp" #include "kapi/system.hpp" -#include "filesystem/inode.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/src/device_file.cpp b/kernel/src/filesystem/device_file.cpp index 8fc159a..c6db5af 100644 --- a/kernel/filesystem/src/device_file.cpp +++ b/kernel/src/filesystem/device_file.cpp @@ -1,9 +1,9 @@ -#include "filesystem/device_file.hpp" +#include "kernel/filesystem/device_file.hpp" #include "kapi/system.hpp" -#include "devices/block_device.hpp" -#include "devices/device.hpp" +#include "kernel/devices/block_device.hpp" +#include "kernel/devices/device.hpp" #include <kstd/cstring> #include <kstd/memory> diff --git a/kernel/filesystem/src/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp index a82a098..408b292 100644 --- a/kernel/filesystem/src/ext2/ext2_filesystem.cpp +++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp @@ -1,8 +1,8 @@ -#include "filesystem/ext2/ext2_filesystem.hpp" +#include "kernel/filesystem/ext2/ext2_filesystem.hpp" -#include "devices/device.hpp" -#include "filesystem/inode.hpp" -#include "filesystem/inode_metadata.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/inode.hpp" +#include "kernel/filesystem/inode_metadata.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/src/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp index 64fad0c..814322e 100644 --- a/kernel/filesystem/src/file_descriptor_table.cpp +++ b/kernel/src/filesystem/file_descriptor_table.cpp @@ -1,8 +1,8 @@ -#include "filesystem/file_descriptor_table.hpp" +#include "kernel/filesystem/file_descriptor_table.hpp" #include "kapi/system.hpp" -#include "filesystem/open_file_description.hpp" +#include "kernel/filesystem/open_file_description.hpp" #include <algorithm> #include <cstddef> diff --git a/kernel/filesystem/src/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp index cdfe7f8..86b7940 100644 --- a/kernel/filesystem/src/filesystem.cpp +++ b/kernel/src/filesystem/filesystem.cpp @@ -1,6 +1,6 @@ -#include "filesystem/filesystem.hpp" +#include "kernel/filesystem/filesystem.hpp" -#include "filesystem/inode.hpp" +#include "kernel/filesystem/inode.hpp" namespace filesystem { diff --git a/kernel/filesystem/src/inode.cpp b/kernel/src/filesystem/inode.cpp index 231ee33..af73662 100644 --- a/kernel/filesystem/src/inode.cpp +++ b/kernel/src/filesystem/inode.cpp @@ -1,9 +1,9 @@ -#include "filesystem/inode.hpp" +#include "kernel/filesystem/inode.hpp" #include "kapi/system.hpp" -#include "devices/device.hpp" -#include "filesystem/inode_metadata.hpp" +#include "kernel/devices/device.hpp" +#include "kernel/filesystem/inode_metadata.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/src/inode_file.cpp b/kernel/src/filesystem/inode_file.cpp index 0b8bdf9..7abac7b 100644 --- a/kernel/filesystem/src/inode_file.cpp +++ b/kernel/src/filesystem/inode_file.cpp @@ -1,8 +1,8 @@ -#include "filesystem/inode_file.hpp" +#include "kernel/filesystem/inode_file.hpp" #include "kapi/system.hpp" -#include "filesystem/inode.hpp" +#include "kernel/filesystem/inode.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/src/mount.cpp b/kernel/src/filesystem/mount.cpp index 021b074..a2c501f 100644 --- a/kernel/filesystem/src/mount.cpp +++ b/kernel/src/filesystem/mount.cpp @@ -1,8 +1,8 @@ -#include "filesystem/mount.hpp" +#include "kernel/filesystem/mount.hpp" #include "kapi/system.hpp" -#include "filesystem/filesystem.hpp" +#include "kernel/filesystem/filesystem.hpp" #include <kstd/memory> diff --git a/kernel/filesystem/src/open_file_description.cpp b/kernel/src/filesystem/open_file_description.cpp index cddee76..ff4d678 100644 --- a/kernel/filesystem/src/open_file_description.cpp +++ b/kernel/src/filesystem/open_file_description.cpp @@ -1,6 +1,6 @@ -#include "filesystem/open_file_description.hpp" +#include "kernel/filesystem/open_file_description.hpp" -#include "filesystem/file.hpp" +#include "kernel/filesystem/file.hpp" #include <kstd/memory> #include <kstd/os/error.hpp> diff --git a/kernel/filesystem/src/vfs.cpp b/kernel/src/filesystem/vfs.cpp index c0f1c3a..8d2ed0a 100644 --- a/kernel/filesystem/src/vfs.cpp +++ b/ |