Merge branch 'refactor' into 'develop-BA-FS26'

Refactor

See merge request teachos/kernel!18

1 files changed, 16 insertions, 16 deletions

diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index bb6d57d..37b4c5b 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -5,9 +5,9 @@
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/device_inode.hpp"
-#include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/file_descriptor_table.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 #include "kernel/filesystem/vfs.hpp"
@@ -24,7 +24,7 @@
 
 auto test_device_names() -> void
 {
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto storage_mgmt = kernel::devices::storage::management::get();
   std::ranges::for_each(storage_mgmt.all_controllers(), [](auto const & controller) {
     std::ranges::for_each(controller->all_devices(),
                           [](auto const & device) { kstd::println("{}", device->name().view()); });
@@ -34,13 +34,13 @@ auto test_device_names() -> void
 auto test_file_description_manually() -> void
 {
   // setup
-  auto fd_table = filesystem::file_descriptor_table::get();
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto fd_table = kernel::filesystem::file_descriptor_table::get();
+  auto storage_mgmt = kernel::devices::storage::management::get();
   auto device = storage_mgmt.device_by_major_minor(1, 0);
 
-  auto dev_node = kstd::make_shared<filesystem::device_inode>(device);
+  auto dev_node = kstd::make_shared<kernel::filesystem::device_inode>(device);
 
-  auto ofd = kstd::make_shared<filesystem::open_file_description>(dev_node);
+  auto ofd = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
   auto fd_index = fd_table.add_file(ofd);
 
   // use: read two bytes and write two again
@@ -66,7 +66,7 @@ auto test_file_description_manually() -> void
   fd_table.remove_file(fd_index);
 
   // use: read four bytes again -> two old bytes two new bytes
-  auto ofd1 = kstd::make_shared<filesystem::open_file_description>(dev_node);
+  auto ofd1 = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
   fd_index = fd_table.add_file(ofd1);
   auto fd1 = fd_table.get_file(fd_index);
 
@@ -85,14 +85,14 @@ auto test_device_with_vfs() -> void
 {
   // TODO BA-FS26
 
-  auto vfs = filesystem::vfs::get();
+  auto vfs = kernel::filesystem::vfs::get();
   auto ofd = vfs.open("/dev/ram0");
   if (!ofd)
   {
     kstd::os::panic("test code failed");
   }
 
-  auto fd_table = filesystem::file_descriptor_table::get();
+  auto fd_table = kernel::filesystem::file_descriptor_table::get();
   auto fd = fd_table.add_file(ofd);
   kstd::vector<std::byte> buffer{2};
   auto file = fd_table.get_file(fd);
@@ -110,8 +110,8 @@ auto test_file_lookup() -> void
 {
   // TODO BA-FS26 implement a more complete test with multiple files and directories and mounts etc.
 
-  auto vfs = filesystem::vfs::get();
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto vfs = kernel::filesystem::vfs::get();
+  auto storage_mgmt = kernel::devices::storage::management::get();
 
   auto ofd1 = vfs.open("/a/b/c");
   auto ofd2 = vfs.open("/dev/ram0");
@@ -126,7 +126,7 @@ auto test_file_lookup() -> void
     kstd::os::panic("test code failed");
   }
 
-  auto new_filesystem = kstd::make_shared<filesystem::ext2::ext2_filesystem>();
+  auto new_filesystem = kstd::make_shared<kernel::filesystem::ext2::filesystem>();
   auto device = storage_mgmt.device_by_major_minor(1, 16);
   new_filesystem->mount(device);
   if (vfs.do_mount("/a/b", new_filesystem) != 0)
@@ -182,13 +182,13 @@ auto main() -> int
   kapi::boot_modules::init();
   kstd::println("[OS] Boot module registry initialized.");
 
-  devices::storage::storage_management::init();
+  kernel::devices::storage::management::init();
   kstd::println("[OS] Storage management initialized.");
 
-  filesystem::file_descriptor_table::init();
+  kernel::filesystem::file_descriptor_table::init();
   kstd::println("[OS] Global file descriptor table initialized.");
 
-  filesystem::vfs::init();
+  kernel::filesystem::vfs::init();
   kstd::println("[OS] Virtual filesystem initialized.");
 
   run_test_code();