aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/include/kernel/filesystem/device_inode.hpp15
-rw-r--r--kernel/include/kernel/filesystem/filesystem.hpp4
-rw-r--r--kernel/include/kernel/filesystem/inode.hpp23
-rw-r--r--kernel/include/kernel/filesystem/inode_metadata.hpp24
-rw-r--r--kernel/src/filesystem/device_inode.cpp50
-rw-r--r--kernel/src/filesystem/ext2/ext2_filesystem.cpp3
-rw-r--r--kernel/src/filesystem/filesystem.cpp4
-rw-r--r--kernel/src/filesystem/inode.cpp85
-rw-r--r--kernel/src/filesystem/vfs.cpp6
9 files changed, 82 insertions, 132 deletions
diff --git a/kernel/include/kernel/filesystem/device_inode.hpp b/kernel/include/kernel/filesystem/device_inode.hpp
index a99e5d1..0287875 100644
--- a/kernel/include/kernel/filesystem/device_inode.hpp
+++ b/kernel/include/kernel/filesystem/device_inode.hpp
@@ -1,13 +1,26 @@
#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVICE_INODE_HPP
#define TEACH_OS_KERNEL_FILESYSTEM_DEVICE_INODE_HPP
+#include "kernel/devices/device.hpp"
#include "kernel/filesystem/inode.hpp"
+#include <kstd/memory>
+
+#include <cstddef>
+
namespace filesystem
{
struct device_inode : inode
{
- // TODO BA-FS26
+ explicit device_inode(kstd::shared_ptr<devices::device> const & device);
+
+ [[nodiscard]] auto backing_device() const -> kstd::shared_ptr<devices::device> const &;
+
+ auto read(void * buffer, size_t offset, size_t size) const -> size_t override;
+ auto write(void const * buffer, size_t offset, size_t size) -> size_t override;
+
+ private:
+ kstd::shared_ptr<devices::device> m_device{};
};
} // namespace filesystem
diff --git a/kernel/include/kernel/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp
index 23924c4..035f49d 100644
--- a/kernel/include/kernel/filesystem/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/filesystem.hpp
@@ -17,10 +17,10 @@ namespace filesystem
virtual auto mount(kstd::shared_ptr<devices::device> const & device) -> int = 0;
virtual auto lookup(inode const & parent, std::string_view name) -> inode * = 0;
- [[nodiscard]] auto root_inode() const -> inode const &;
+ [[nodiscard]] auto root_inode() const -> kstd::shared_ptr<inode> const &;
protected:
- inode m_root_inode{}; // TODO BA-FS26 set during mount?
+ kstd::shared_ptr<inode> m_root_inode{};
};
} // namespace filesystem
diff --git a/kernel/include/kernel/filesystem/inode.hpp b/kernel/include/kernel/filesystem/inode.hpp
index a2955f9..dcf83b9 100644
--- a/kernel/include/kernel/filesystem/inode.hpp
+++ b/kernel/include/kernel/filesystem/inode.hpp
@@ -1,9 +1,6 @@
#ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP
#define TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP
-#include "kernel/devices/device.hpp"
-#include "kernel/filesystem/inode_metadata.hpp"
-
#include <kstd/memory>
#include <cstddef>
@@ -12,26 +9,26 @@ namespace filesystem
{
struct inode
{
- inode() = default;
+ enum class inode_kind
+ {
+ regular,
+ directory,
+ device
+ };
+
explicit inode(inode_kind kind);
- explicit inode(kstd::shared_ptr<devices::device> const & device);
- [[nodiscard]] auto metadata() const -> inode_metadata;
+ virtual ~inode() = default;
[[nodiscard]] auto is_directory() const -> bool;
[[nodiscard]] auto is_regular() const -> bool;
[[nodiscard]] auto is_device() const -> bool;
- [[nodiscard]] auto is_block_device() const -> bool;
- [[nodiscard]] auto major_device() const -> size_t;
- [[nodiscard]] auto minor_device() const -> size_t;
- [[nodiscard]] auto backing_device() const -> kstd::shared_ptr<devices::device> const &;
- auto read(void * buffer, size_t offset, size_t size) const -> size_t;
- auto write(void const * buffer, size_t offset, size_t size) -> size_t;
+ virtual auto read(void * buffer, size_t offset, size_t size) const -> size_t = 0;
+ virtual auto write(void const * buffer, size_t offset, size_t size) -> size_t = 0;
private:
inode_kind m_kind{inode_kind::regular};
- kstd::shared_ptr<devices::device> m_device{};
};
} // namespace filesystem
diff --git a/kernel/include/kernel/filesystem/inode_metadata.hpp b/kernel/include/kernel/filesystem/inode_metadata.hpp
deleted file mode 100644
index ed5a09d..0000000
--- a/kernel/include/kernel/filesystem/inode_metadata.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP
-
-#include <cstddef>
-#include <optional>
-
-namespace filesystem
-{
- enum class inode_kind
- {
- regular,
- directory,
- device
- };
-
- struct inode_metadata
- {
- inode_kind kind{inode_kind::regular};
- std::optional<size_t> major{};
- std::optional<size_t> minor{};
- };
-} // namespace filesystem
-
-#endif // TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP \ No newline at end of file
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index b9018b1..18e3b24 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -1,6 +1,52 @@
#include "kernel/filesystem/device_inode.hpp"
+#include "kapi/system.hpp"
+
+#include "kernel/devices/device.hpp"
+#include "kernel/filesystem/inode.hpp"
+
+#include <kstd/memory>
+
+#include <cstddef>
+
namespace filesystem
{
- // TODO BA-FS26: Implement device inode
-} \ No newline at end of file
+ device_inode::device_inode(kstd::shared_ptr<devices::device> const & device)
+ : inode(inode_kind::device)
+ , m_device(device)
+ {
+ if (!device)
+ {
+ kapi::system::panic("[FILESYSTEM] device_inode constructed with null device.");
+ }
+ }
+
+ auto device_inode::backing_device() const -> kstd::shared_ptr<devices::device> const &
+ {
+ return m_device;
+ }
+
+ auto device_inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
+ {
+ if (!m_device)
+ {
+ kapi::system::panic("[FILESYSTEM] device_inode has null device.");
+ }
+
+ // TODO BA-FS26 use device file?
+ // return m_device->read(buffer, offset, size);
+ return 0;
+ }
+
+ auto device_inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
+ {
+ if (!m_device)
+ {
+ kapi::system::panic("[FILESYSTEM] device_inode has null device.");
+ }
+
+ // TODO BA-FS26 use device file?
+ // return m_device->write(buffer, offset, size);
+ return 0;
+ }
+} // namespace filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
index 408b292..87845d5 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
@@ -2,7 +2,6 @@
#include "kernel/devices/device.hpp"
#include "kernel/filesystem/inode.hpp"
-#include "kernel/filesystem/inode_metadata.hpp"
#include <kstd/memory>
@@ -19,7 +18,7 @@ namespace filesystem::ext2
m_device = device;
// TODO BA-FS26 load proper root inode from ext2 metadata
- m_root_inode = inode{inode_kind::directory};
+ // m_root_inode = inode{inode_kind::directory};
// TODO BA-FS26 implement
return 0;
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index 86b7940..50b5587 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -2,9 +2,11 @@
#include "kernel/filesystem/inode.hpp"
+#include <kstd/memory>
+
namespace filesystem
{
- auto filesystem::root_inode() const -> inode const &
+ auto filesystem::root_inode() const -> kstd::shared_ptr<inode> const &
{
return m_root_inode;
}
diff --git a/kernel/src/filesystem/inode.cpp b/kernel/src/filesystem/inode.cpp
index af73662..de3282f 100644
--- a/kernel/src/filesystem/inode.cpp
+++ b/kernel/src/filesystem/inode.cpp
@@ -1,44 +1,11 @@
#include "kernel/filesystem/inode.hpp"
-#include "kapi/system.hpp"
-
-#include "kernel/devices/device.hpp"
-#include "kernel/filesystem/inode_metadata.hpp"
-
-#include <kstd/memory>
-
-#include <cstddef>
-
namespace filesystem
{
inode::inode(inode_kind kind)
: m_kind(kind)
{}
- inode::inode(kstd::shared_ptr<devices::device> const & device)
- : m_kind(inode_kind::device)
- , m_device(device)
- {
- if (!m_device)
- {
- kapi::system::panic("[FILESYSTEM] inode constructed with null device.");
- }
- }
-
- auto inode::metadata() const -> inode_metadata
- {
- auto meta = inode_metadata{};
- meta.kind = m_kind;
-
- if (is_device())
- {
- meta.major = m_device->major();
- meta.minor = m_device->minor();
- }
-
- return meta;
- }
-
auto inode::is_directory() const -> bool
{
return m_kind == inode_kind::directory;
@@ -53,56 +20,4 @@ namespace filesystem
{
return m_kind == inode_kind::device;
}
-
- auto inode::is_block_device() const -> bool
- {
- return is_device() && m_device->is_block_device();
- }
-
- auto inode::major_device() const -> size_t
- {
- if (!is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::major_device called on non-device inode.");
- }
-
- return m_device->major();
- }
-
- auto inode::minor_device() const -> size_t
- {
- if (!is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::minor_device called on non-device inode.");
- }
-
- return m_device->minor();
- }
-
- auto inode::backing_device() const -> kstd::shared_ptr<devices::device> const &
- {
- return m_device;
- }
-
- auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
- {
- if (is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::read called on device inode. Open it as a device file first.");
- }
-
- // TODO BA-FS26
- return 0;
- }
-
- auto inode::write(void const *, size_t, size_t) -> size_t
- {
- if (is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::write called on device inode. Open it as a device file first.");
- }
-
- kapi::system::panic("[FILESYSTEM] inode::write is not implemented yet");
- return 0;
- }
} // namespace filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 4e0b6bf..188da6d 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -6,6 +6,7 @@
#include "kernel/devices/storage/storage_management.hpp"
#include "kernel/filesystem/custody.hpp"
#include "kernel/filesystem/device_file.hpp"
+#include "kernel/filesystem/device_inode.hpp"
#include "kernel/filesystem/ext2/ext2_filesystem.hpp"
#include "kernel/filesystem/inode.hpp"
#include "kernel/filesystem/inode_file.hpp"
@@ -72,7 +73,8 @@ namespace filesystem
auto node = custody->get_inode();
if (node->is_device())
{
- auto current_device_file = kstd::make_shared<device_file>(node->backing_device());
+ auto device_node = static_cast<device_inode *>(node.get());
+ auto current_device_file = kstd::make_shared<device_file>(device_node->backing_device());
current_device_file->open();
return open_file_description{current_device_file};
}
@@ -92,7 +94,7 @@ namespace filesystem
kapi::system::panic("[FILESYSTEM] make_device_node called with null device.");
}
- m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<inode>(device)});
+ m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<device_inode>(device)});
}
auto vfs::resolve_path(std::string_view path) -> std::optional<custody>
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-19 12:09:11 +0000