Merge branch 'ext2' into 'develop-BA-FS26'HEADdevelop-BA-FS26

ext2 and tests

See merge request teachos/kernel!22

1 files changed, 41 insertions, 3 deletions

diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index 0ac9cf8..d8b04eb 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -1,24 +1,62 @@
 #include "kernel/filesystem/filesystem.hpp"
 
 #include "kapi/devices/device.hpp"
+#include "kapi/system.hpp"
+
+#include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
 #include <kstd/memory>
 
+#include <array>
+
 namespace kernel::filesystem
 {
-  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int
+  namespace
+  {
+    constexpr auto static filesystem_factories = std::array{
+      []() { return kstd::make_shared<ext2::filesystem>(); },
+    };
+  }  // namespace
+
+  auto filesystem::probe_and_mount(kstd::shared_ptr<kapi::devices::device> const & device)
+      -> kstd::shared_ptr<filesystem>
+  {
+    if (!device)
+    {
+      kapi::system::panic("[FILESYSTEM] cannot mount filesystem: device is null.");
+    }
+
+    for (auto & factory : filesystem_factories)
+    {
+      auto fs = factory();
+      if (fs->mount(device) == operation_result::success)
+      {
+        return fs;
+      }
+    }
+
+    return nullptr;
+  }
+
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> operation_result
   {
     if (!device)
     {
-      return -1;  // TODO BA-FS26 panic or errorcode?
+      kapi::system::panic("[FILESYSTEM] cannot mount filesystem: device is null.");
     }
+
     m_device = device;
-    return 0;
+    return operation_result::success;
   }
 
   auto filesystem::root_inode() const -> kstd::shared_ptr<inode> const &
   {
     return m_root_inode;
   }
+
+  auto filesystem::device() const -> kstd::shared_ptr<kapi::devices::device> const &
+  {
+    return m_device;
+  }
 }  // namespace kernel::filesystem
\ No newline at end of file