From 2af1bbc99e2a8fc4b86bb31023dbbb077b1cbc97 Mon Sep 17 00:00:00 2001 From: Lukas Oesch Date: Sun, 15 Mar 2026 16:49:07 +0100 Subject: move m_devices from ram_disk_controller to storage_controller, store point to devices --- kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp | 6 +++--- kernel/filesystem/include/filesystem/filesystem.hpp | 4 ++-- kernel/filesystem/src/ext2/ext2_filesystem.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kernel/filesystem') diff --git a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp b/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp index 0027475..91ba14a 100644 --- a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp +++ b/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp @@ -1,17 +1,17 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP #define TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP -#include "devices/block_device.hpp" +#include "devices/device.hpp" #include "filesystem/filesystem.hpp" namespace filesystem::ext2 { struct ext2_filesystem : filesystem { - auto mount(devices::block_device * block_device) -> int override; + auto mount(devices::device * device) -> int override; private: - devices::block_device * m_block_device{}; + devices::device * m_device{}; }; } // namespace filesystem::ext2 diff --git a/kernel/filesystem/include/filesystem/filesystem.hpp b/kernel/filesystem/include/filesystem/filesystem.hpp index d5704c1..113b239 100644 --- a/kernel/filesystem/include/filesystem/filesystem.hpp +++ b/kernel/filesystem/include/filesystem/filesystem.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP #define TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP -#include "devices/block_device.hpp" +#include "devices/device.hpp" #include "filesystem/inode.hpp" namespace filesystem @@ -10,7 +10,7 @@ namespace filesystem { virtual ~filesystem() = default; - virtual auto mount(devices::block_device * block_device) -> int = 0; + virtual auto mount(devices::device * device) -> int = 0; auto root_inode() -> inode *; diff --git a/kernel/filesystem/src/ext2/ext2_filesystem.cpp b/kernel/filesystem/src/ext2/ext2_filesystem.cpp index bdd430d..7111d13 100644 --- a/kernel/filesystem/src/ext2/ext2_filesystem.cpp +++ b/kernel/filesystem/src/ext2/ext2_filesystem.cpp @@ -1,12 +1,12 @@ #include "filesystem/ext2/ext2_filesystem.hpp" -#include "devices/block_device.hpp" +#include "devices/device.hpp" namespace filesystem::ext2 { - auto ext2_filesystem::mount(devices::block_device * block_device) -> int + auto ext2_filesystem::mount(devices::device * device) -> int { - if (!block_device) + if (!device) { return -1; // TODO BA-FS26 panic or errorcode? } -- cgit v1.2.3