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

Refactor

See merge request teachos/kernel!18

3 files changed, 33 insertions, 33 deletions

diff --git a/kernel/src/filesystem/devfs/devfs_root_inode.cpp b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
deleted file mode 100644
index 53441b0..0000000
--- a/kernel/src/filesystem/devfs/devfs_root_inode.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "kernel/filesystem/devfs/devfs_root_inode.hpp"
-
-#include "kernel/filesystem/inode.hpp"
-
-#include <cstddef>
-
-namespace filesystem::devfs
-{
-  devfs_root_inode::devfs_root_inode()
-      : inode(inode_kind::directory)
-  {}
-
-  auto devfs_root_inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
-  {
-    return 0;
-  }
-
-  auto devfs_root_inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
-  {
-    return 0;
-  }
-}  // namespace filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_filesystem.cpp b/kernel/src/filesystem/devfs/filesystem.cpp
index c4cd81a..94c9b05 100644
--- a/kernel/src/filesystem/devfs/devfs_filesystem.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.cpp
@@ -1,8 +1,8 @@
-#include "kernel/filesystem/devfs/devfs_filesystem.hpp"
+#include "kernel/filesystem/devfs/filesystem.hpp"
 
 #include "kernel/devices/device.hpp"
-#include "kernel/devices/storage/storage_management.hpp"
-#include "kernel/filesystem/devfs/devfs_root_inode.hpp"
+#include "kernel/devices/storage/management.hpp"
+#include "kernel/filesystem/devfs/inode.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/inode.hpp"
 
@@ -11,18 +11,18 @@
 #include <algorithm>
 #include <string_view>
 
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
 {
-  auto devfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
+  auto filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
   {
-    m_root_inode = kstd::make_shared<devfs_root_inode>();
+    m_root_inode = kstd::make_shared<inode>();
     build_device_inode_table();
 
     return 0;
   }
 
-  auto devfs_filesystem::lookup(kstd::shared_ptr<inode> const & parent, std::string_view name)
-      -> kstd::shared_ptr<inode>
+  auto filesystem::lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+      -> kstd::shared_ptr<kernel::filesystem::inode>
   {
     if (!parent || !parent->is_directory())
     {
@@ -45,14 +45,14 @@ namespace filesystem::devfs
     return (it != m_inodes.end()) ? *it : nullptr;
   }
 
-  auto devfs_filesystem::build_device_inode_table() -> void
+  auto filesystem::build_device_inode_table() -> void
   {
     m_inodes.clear();
 
-    auto storage_mgmt = devices::storage::storage_management::get();
+    auto storage_mgmt = 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) { m_inodes.push_back(kstd::make_shared<device_inode>(device)); });
     });
   }
-}  // namespace filesystem::devfs
\ No newline at end of file
+}  // namespace kernel::filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/inode.cpp b/kernel/src/filesystem/devfs/inode.cpp
new file mode 100644
index 0000000..52cf6fa
--- /dev/null
+++ b/kernel/src/filesystem/devfs/inode.cpp
@@ -0,0 +1,22 @@
+#include "kernel/filesystem/devfs/inode.hpp"
+
+#include "kernel/filesystem/inode.hpp"
+
+#include <cstddef>
+
+namespace kernel::filesystem::devfs
+{
+  inode::inode()
+      : kernel::filesystem::inode(inode_kind::directory)
+  {}
+
+  auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
+  {
+    return 0;
+  }
+
+  auto inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
+  {
+    return 0;
+  }
+}  // namespace kernel::filesystem::devfs
\ No newline at end of file