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

Ext2-initial-structure

See merge request teachos/kernel!17

2 files changed, 35 insertions, 20 deletions

diff --git a/kernel/src/filesystem/ext2/ext2_file.cpp b/kernel/src/filesystem/ext2/ext2_file.cpp
deleted file mode 100644
index 7217c77..0000000
--- a/kernel/src/filesystem/ext2/ext2_file.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "kernel/filesystem/ext2/ext2_file.hpp"
-
-#include "kapi/system.hpp"
-
-#include <cstddef>
-
-namespace filesystem::ext2
-{
-  auto ext2_file::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
-  {
-    kapi::system::panic("[FILESYSTEM] ext2_file::read is not implemented yet.");
-    return 0;
-  }
-
-  auto ext2_file::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
-  {
-    kapi::system::panic("[FILESYSTEM] ext2_file::write is not implemented yet.");
-    return 0;
-  }
-}  // namespace filesystem::ext2
diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
index 373c6a2..ea6fe0d 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
@@ -1,16 +1,50 @@
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
 
+#include "kernel/devices/block_device_utils.hpp"
 #include "kernel/devices/device.hpp"
 #include "kernel/filesystem/ext2/ext2_inode.hpp"
+#include "kernel/filesystem/ext2/ext2_superblock.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
 #include <kstd/memory>
 
+#include <cstddef>
+#include <cstdint>
 #include <string_view>
 
 namespace filesystem::ext2
 {
+  namespace
+  {
+    // constexpr size_t SUPERBLOCK_OFFSET = 1024;
+    // constexpr uint16_t EXT2_MAGIC = 0xEF53;
+
+    // // Mode bits
+    // constexpr uint16_t S_IFMT = 0xF000;
+    // constexpr uint16_t S_IFREG = 0x8000;
+    // constexpr uint16_t S_IFDIR = 0x4000;
+
+    // auto S_ISREG(uint16_t mode) -> bool
+    // {
+    //   return (mode & S_IFMT) == S_IFREG;
+    // }
+    // auto S_ISDIR(uint16_t mode) -> bool
+    // {
+    //   return (mode & S_IFMT) == S_IFDIR;
+    // }
+
+    // auto get_block_size(ext2_superblock const & superblock) -> size_t
+    // {
+    //   return 1024U << superblock.log_block_size;
+    // }
+
+    // auto get_inode_size(ext2_superblock const & superblock) -> size_t
+    // {
+    //   return superblock.rev_level == 0 ? 128 : superblock.inode_size;
+    // }
+  }  // namespace
+
   auto ext2_filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
   {
     filesystem::mount(device);  // TODO BA-FS26 error handling?
@@ -19,6 +53,7 @@ namespace filesystem::ext2
 
     // TODO BA-FS26 implement
     m_root_inode = kstd::make_shared<ext2_inode>();
+    // devices::block_device_utils::read(device, nullptr, 0, 0);  // TODO BA-FS26 just for testing
     return 0;
   }