From 3ace886a9e9f044cd48de51f0a15aceb02bfa9b2 Mon Sep 17 00:00:00 2001 From: "marcel.braun" Date: Tue, 17 Mar 2026 19:36:20 +0100 Subject: Clean up project folder structure --- kernel/CMakeLists.txt | 21 +++- kernel/devices/CMakeLists.txt | 31 ------ kernel/devices/include/devices/block_device.hpp | 101 ----------------- kernel/devices/include/devices/device.hpp | 61 ---------- .../storage/ram_disk/ram_disk_controller.hpp | 31 ------ .../devices/storage/ram_disk/ram_disk_device.hpp | 52 --------- .../include/devices/storage/storage_controller.hpp | 71 ------------ .../include/devices/storage/storage_management.hpp | 77 ------------- kernel/devices/src/block_device.cpp | 42 ------- kernel/devices/src/device.cpp | 28 ----- .../src/storage/ram_disk/ram_disk_controller.cpp | 28 ----- .../src/storage/ram_disk/ram_disk_device.cpp | 77 ------------- kernel/devices/src/storage/storage_controller.cpp | 44 -------- kernel/devices/src/storage/storage_management.cpp | 85 -------------- kernel/filesystem/CMakeLists.txt | 43 ------- kernel/filesystem/include/filesystem/custody.hpp | 23 ---- .../filesystem/include/filesystem/device_file.hpp | 32 ------ .../include/filesystem/ext2/ext2_filesystem.hpp | 24 ---- kernel/filesystem/include/filesystem/file.hpp | 19 ---- .../include/filesystem/file_descriptor_table.hpp | 31 ------ .../filesystem/include/filesystem/filesystem.hpp | 28 ----- kernel/filesystem/include/filesystem/inode.hpp | 38 ------- .../filesystem/include/filesystem/inode_file.hpp | 27 ----- .../include/filesystem/inode_metadata.hpp | 24 ---- kernel/filesystem/include/filesystem/mount.hpp | 25 ----- .../include/filesystem/open_file_description.hpp | 28 ----- kernel/filesystem/include/filesystem/vfs.hpp | 46 -------- kernel/filesystem/src/custody.cpp | 30 ----- kernel/filesystem/src/device_file.cpp | 124 --------------------- kernel/filesystem/src/ext2/ext2_filesystem.cpp | 33 ------ kernel/filesystem/src/file_descriptor_table.cpp | 82 -------------- kernel/filesystem/src/filesystem.cpp | 11 -- kernel/filesystem/src/inode.cpp | 108 ------------------ kernel/filesystem/src/inode_file.cpp | 35 ------ kernel/filesystem/src/mount.cpp | 32 ------ kernel/filesystem/src/open_file_description.cpp | 35 ------ kernel/filesystem/src/vfs.cpp | 123 -------------------- kernel/include/kernel/devices/block_device.hpp | 101 +++++++++++++++++ kernel/include/kernel/devices/device.hpp | 61 ++++++++++ .../storage/ram_disk/ram_disk_controller.hpp | 31 ++++++ .../devices/storage/ram_disk/ram_disk_device.hpp | 52 +++++++++ .../kernel/devices/storage/storage_controller.hpp | 71 ++++++++++++ .../kernel/devices/storage/storage_management.hpp | 77 +++++++++++++ kernel/include/kernel/filesystem/custody.hpp | 23 ++++ kernel/include/kernel/filesystem/device_file.hpp | 32 ++++++ .../kernel/filesystem/ext2/ext2_filesystem.hpp | 24 ++++ kernel/include/kernel/filesystem/file.hpp | 19 ++++ .../kernel/filesystem/file_descriptor_table.hpp | 31 ++++++ kernel/include/kernel/filesystem/filesystem.hpp | 28 +++++ kernel/include/kernel/filesystem/inode.hpp | 38 +++++++ kernel/include/kernel/filesystem/inode_file.hpp | 27 +++++ .../include/kernel/filesystem/inode_metadata.hpp | 24 ++++ kernel/include/kernel/filesystem/mount.hpp | 25 +++++ .../kernel/filesystem/open_file_description.hpp | 28 +++++ kernel/include/kernel/filesystem/vfs.hpp | 46 ++++++++ kernel/src/devices/block_device.cpp | 42 +++++++ kernel/src/devices/device.cpp | 28 +++++ .../storage/ram_disk/ram_disk_controller.cpp | 28 +++++ .../devices/storage/ram_disk/ram_disk_device.cpp | 77 +++++++++++++ kernel/src/devices/storage/storage_controller.cpp | 44 ++++++++ kernel/src/devices/storage/storage_management.cpp | 85 ++++++++++++++ kernel/src/filesystem/custody.cpp | 30 +++++ kernel/src/filesystem/device_file.cpp | 124 +++++++++++++++++++++ kernel/src/filesystem/ext2/ext2_filesystem.cpp | 33 ++++++ kernel/src/filesystem/file_descriptor_table.cpp | 82 ++++++++++++++ kernel/src/filesystem/filesystem.cpp | 11 ++ kernel/src/filesystem/inode.cpp | 108 ++++++++++++++++++ kernel/src/filesystem/inode_file.cpp | 35 ++++++ kernel/src/filesystem/mount.cpp | 32 ++++++ kernel/src/filesystem/open_file_description.cpp | 35 ++++++ kernel/src/filesystem/vfs.cpp | 123 ++++++++++++++++++++ kernel/src/main.cpp | 10 +- 72 files changed, 1676 insertions(+), 1739 deletions(-) delete mode 100644 kernel/devices/CMakeLists.txt delete mode 100644 kernel/devices/include/devices/block_device.hpp delete mode 100644 kernel/devices/include/devices/device.hpp delete mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp delete mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp delete mode 100644 kernel/devices/include/devices/storage/storage_controller.hpp delete mode 100644 kernel/devices/include/devices/storage/storage_management.hpp delete mode 100644 kernel/devices/src/block_device.cpp delete mode 100644 kernel/devices/src/device.cpp delete mode 100644 kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp delete mode 100644 kernel/devices/src/storage/ram_disk/ram_disk_device.cpp delete mode 100644 kernel/devices/src/storage/storage_controller.cpp delete mode 100644 kernel/devices/src/storage/storage_management.cpp delete mode 100644 kernel/filesystem/CMakeLists.txt delete mode 100644 kernel/filesystem/include/filesystem/custody.hpp delete mode 100644 kernel/filesystem/include/filesystem/device_file.hpp delete mode 100644 kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp delete mode 100644 kernel/filesystem/include/filesystem/file.hpp delete mode 100644 kernel/filesystem/include/filesystem/file_descriptor_table.hpp delete mode 100644 kernel/filesystem/include/filesystem/filesystem.hpp delete mode 100644 kernel/filesystem/include/filesystem/inode.hpp delete mode 100644 kernel/filesystem/include/filesystem/inode_file.hpp delete mode 100644 kernel/filesystem/include/filesystem/inode_metadata.hpp delete mode 100644 kernel/filesystem/include/filesystem/mount.hpp delete mode 100644 kernel/filesystem/include/filesystem/open_file_description.hpp delete mode 100644 kernel/filesystem/include/filesystem/vfs.hpp delete mode 100644 kernel/filesystem/src/custody.cpp delete mode 100644 kernel/filesystem/src/device_file.cpp delete mode 100644 kernel/filesystem/src/ext2/ext2_filesystem.cpp delete mode 100644 kernel/filesystem/src/file_descriptor_table.cpp delete mode 100644 kernel/filesystem/src/filesystem.cpp delete mode 100644 kernel/filesystem/src/inode.cpp delete mode 100644 kernel/filesystem/src/inode_file.cpp delete mode 100644 kernel/filesystem/src/mount.cpp delete mode 100644 kernel/filesystem/src/open_file_description.cpp delete mode 100644 kernel/filesystem/src/vfs.cpp create mode 100644 kernel/include/kernel/devices/block_device.hpp create mode 100644 kernel/include/kernel/devices/device.hpp create mode 100644 kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp create mode 100644 kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp create mode 100644 kernel/include/kernel/devices/storage/storage_controller.hpp create mode 100644 kernel/include/kernel/devices/storage/storage_management.hpp create mode 100644 kernel/include/kernel/filesystem/custody.hpp create mode 100644 kernel/include/kernel/filesystem/device_file.hpp create mode 100644 kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp create mode 100644 kernel/include/kernel/filesystem/file.hpp create mode 100644 kernel/include/kernel/filesystem/file_descriptor_table.hpp create mode 100644 kernel/include/kernel/filesystem/filesystem.hpp create mode 100644 kernel/include/kernel/filesystem/inode.hpp create mode 100644 kernel/include/kernel/filesystem/inode_file.hpp create mode 100644 kernel/include/kernel/filesystem/inode_metadata.hpp create mode 100644 kernel/include/kernel/filesystem/mount.hpp create mode 100644 kernel/include/kernel/filesystem/open_file_description.hpp create mode 100644 kernel/include/kernel/filesystem/vfs.hpp create mode 100644 kernel/src/devices/block_device.cpp create mode 100644 kernel/src/devices/device.cpp create mode 100644 kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp create mode 100644 kernel/src/devices/storage/ram_disk/ram_disk_device.cpp create mode 100644 kernel/src/devices/storage/storage_controller.cpp create mode 100644 kernel/src/devices/storage/storage_management.cpp create mode 100644 kernel/src/filesystem/custody.cpp create mode 100644 kernel/src/filesystem/device_file.cpp create mode 100644 kernel/src/filesystem/ext2/ext2_filesystem.cpp create mode 100644 kernel/src/filesystem/file_descriptor_table.cpp create mode 100644 kernel/src/filesystem/filesystem.cpp create mode 100644 kernel/src/filesystem/inode.cpp create mode 100644 kernel/src/filesystem/inode_file.cpp create mode 100644 kernel/src/filesystem/mount.cpp create mode 100644 kernel/src/filesystem/open_file_description.cpp create mode 100644 kernel/src/filesystem/vfs.cpp diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 830c527..398022c 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -1,6 +1,3 @@ -add_subdirectory("devices") -add_subdirectory("filesystem") - add_executable("kernel" # Platform-independent KAPI implementation "kapi/boot_modules.cpp" @@ -18,6 +15,22 @@ add_executable("kernel" "src/memory/block_list_allocator.cpp" "src/memory/operators.cpp" "src/memory.cpp" + "src/devices/device.cpp" + "src/devices/block_device.cpp" + "src/devices/storage/storage_controller.cpp" + "src/devices/storage/storage_management.cpp" + "src/devices/storage/ram_disk/ram_disk_controller.cpp" + "src/devices/storage/ram_disk/ram_disk_device.cpp" + "src/filesystem/ext2/ext2_filesystem.cpp" + "src/filesystem/custody.cpp" + "src/filesystem/device_file.cpp" + "src/filesystem/file_descriptor_table.cpp" + "src/filesystem/filesystem.cpp" + "src/filesystem/inode_file.cpp" + "src/filesystem/inode.cpp" + "src/filesystem/mount.cpp" + "src/filesystem/open_file_description.cpp" + "src/filesystem/vfs.cpp" ) target_include_directories("kernel" PRIVATE @@ -27,8 +40,6 @@ target_include_directories("kernel" PRIVATE target_link_libraries("kernel" PRIVATE "os::arch" "os::kapi" - "kernel::devices" - "kernel::filesystem" ) target_link_options("kernel" PRIVATE diff --git a/kernel/devices/CMakeLists.txt b/kernel/devices/CMakeLists.txt deleted file mode 100644 index 15d03fa..0000000 --- a/kernel/devices/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -add_library("kernel_devices" STATIC) -add_library("kernel::devices" ALIAS "kernel_devices") - -target_sources("kernel_devices" PRIVATE - "src/device.cpp" - "src/block_device.cpp" - "src/storage/storage_controller.cpp" - "src/storage/storage_management.cpp" - "src/storage/ram_disk/ram_disk_controller.cpp" - "src/storage/ram_disk/ram_disk_device.cpp" -) - -target_sources("kernel_devices" PUBLIC - FILE_SET HEADERS - BASE_DIRS "include" - FILES - "include/devices/device.hpp" - "include/devices/block_device.hpp" - "include/devices/storage/storage_controller.hpp" - "include/devices/storage/storage_management.hpp" - "include/devices/storage/ram_disk/ram_disk_controller.hpp" - "include/devices/storage/ram_disk/ram_disk_device.hpp" -) - -target_include_directories("kernel_devices" PUBLIC - "include" -) - -target_link_libraries("kernel_devices" PRIVATE - "os::kapi" -) \ No newline at end of file diff --git a/kernel/devices/include/devices/block_device.hpp b/kernel/devices/include/devices/block_device.hpp deleted file mode 100644 index 4831be5..0000000 --- a/kernel/devices/include/devices/block_device.hpp +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP - -#include "devices/device.hpp" - -#include -#include - -namespace devices -{ - /** - * @brief Base interface for block-addressable devices. - */ - struct block_device : device - { - /** - * @brief Create a block device descriptor. - * @param major Device major number. - * @param minor Device minor number. - * @param name Device name. - * @param block_size Size of one logical block in bytes. - */ - block_device(size_t major, size_t minor, std::string_view name, size_t block_size); - - /** - * @brief Virtual destructor for block device. - */ - virtual ~block_device() = default; - - /** - * @brief Read data from the block at @p block_index into @p buffer. - * @param block_index Zero-based block index. - * @param buffer Destination buffer. - * @warning Panics if @p buffer is null. - * @note Reads up to one logical block (see constructor @p block_size). Implementations may perform a partial - * transfer for the final block when fewer than @p block_size bytes remain. - */ - virtual auto read_block(size_t block_index, void * buffer) const -> void = 0; - - /** - * @brief Write data to the block at @p block_index. - * @param block_index Zero-based block index. - * @param buffer Source buffer, must not be null. - * @warning Panics if @p buffer is null. - * @note Writes up to one logical block (see constructor @p block_size). - * Implementations may perform a partial transfer for the final block when - * fewer than @p block_size bytes remain. - */ - virtual auto write_block(size_t block_index, void const * buffer) -> void = 0; - - /** - * @brief Return logical block size in bytes. - * @return One logical block size in bytes. - */ - [[nodiscard]] auto block_size() const -> size_t; - - /** - * @brief Return device capacity in bytes. - * @return Total number of addressable bytes. - */ - [[nodiscard]] auto capacity() const -> size_t; - - /** - * @brief Override to identify block devices. - * @return true if this device is a block device, false otherwise. - */ - - [[nodiscard]] auto is_block_device() const -> bool override - { - return true; - } - - protected: - /** - * @brief Information describing the transfer window for one block index. - */ - struct transfer_info - { - size_t offset; - size_t to_transfer; - size_t remainder; - }; - - /** - * @brief Return total device size in bytes. - * @return Total number of addressable bytes. - */ - [[nodiscard]] virtual auto size() const -> size_t = 0; - - /** - * @brief Compute transfer information for @p block_index. - * @param block_index Zero-based block index. - * @return Computed transfer information for one logical block access. - */ - [[nodiscard]] auto calculate_transfer(size_t block_index) const -> transfer_info; - - size_t m_block_size; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/device.hpp b/kernel/devices/include/devices/device.hpp deleted file mode 100644 index d6f520f..0000000 --- a/kernel/devices/include/devices/device.hpp +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_DEVICE_HPP - -#include -#include - -namespace devices -{ - /** - * @brief Base device identified by a major, minor number and name. - */ - struct device - { - /** - * @brief Create a device identifier from @p major, @p minor and @p name. - * @param major Device major number. - * @param minor Device minor number. - * @param name Device name. - */ - device(size_t major, size_t minor, std::string_view name); - - /** - * @brief Virtual destructor for device. - */ - virtual ~device() = default; - - /** - * @brief Returns the major number of the device. - * @return Device major number. - */ - [[nodiscard]] auto major() const -> size_t; - - /** - * @brief Returns the minor number of the device. - * @return Device minor number. - */ - [[nodiscard]] auto minor() const -> size_t; - - /** - * @brief Returns the name of the device. - * @return Device name. - */ - [[nodiscard]] auto name() const -> std::string_view; - - /** - * @brief Check if the device is a block device. - * @return true if this device is a block device, false otherwise. - */ - [[nodiscard]] virtual auto is_block_device() const -> bool - { - return false; - } - - private: - size_t m_major; - size_t m_minor; - std::string_view m_name; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp deleted file mode 100644 index f69f8d8..0000000 --- a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP - -#include "kapi/boot_module/boot_module_registry.hpp" - -#include "devices/storage/storage_controller.hpp" - -namespace devices::storage::ram_disk -{ - /** - * @brief Storage controller that exposes boot modules as RAM-disk devices. - */ - struct ram_disk_controller : storage_controller - { - /** - * @brief Create a RAM-disk controller. - * @param registry Boot module registry as device source. - */ - explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry); - - /** - * @brief Probe boot modules and create RAM-disk devices. - */ - auto probe() -> void override; - - private: - kapi::boot_modules::boot_module_registry const * m_boot_module_registry; - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp deleted file mode 100644 index 1edf48c..0000000 --- a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP - -#include "kapi/boot_module/boot_module.hpp" - -#include "devices/block_device.hpp" - -#include - -namespace devices::storage::ram_disk -{ - /** - * @brief Block device for a boot module. - */ - struct ram_disk_device : block_device - { - /** - * @brief Create a RAM disk for the @p module. - * @param module Boot module providing the memory region. - * @param major Device major number. - * @param minor Device minor number. - */ - ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor); - - /** - * @brief Read one logical block into @p buffer. - * @param block_index Zero-based block index. - * @param buffer Destination buffer, must not be null. - * @note If the request reaches the module end, only available bytes are copied and the rest of the - * logical block is filled with zeros. - */ - auto read_block(size_t block_index, void * buffer) const -> void override; - - /** - * @brief Write one logical block from @p buffer. - * @param block_index Zero-based block index. - * @param buffer Source buffer, must not be null. - * @note If the request reaches the module end, only the bytes in the module range are written. - */ - auto write_block(size_t block_index, void const * buffer) -> void override; - - private: - /** - * @brief Return module size in bytes. - */ - [[nodiscard]] auto size() const -> size_t override; - - kapi::boot_modules::boot_module m_boot_module{}; - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_controller.hpp b/kernel/devices/include/devices/storage/storage_controller.hpp deleted file mode 100644 index 7760fc9..0000000 --- a/kernel/devices/include/devices/storage/storage_controller.hpp +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP - -#include "devices/device.hpp" - -#include -#include - -#include - -namespace devices::storage -{ - /** - * @brief Base interface for storage controllers. - * - * A storage controller probes for devices and resolves devices by major/minor - * numbers. - */ - struct storage_controller - { - /** - * @brief Virtual destructor. - */ - virtual ~storage_controller() = default; - - /** - * @brief Probe the controller and register discovered devices. - */ - virtual auto probe() -> void = 0; - - /** - * @brief Assign the major number and minor stride for this controller. - * @param major Major number assigned to this controller. - * @param minors_per_dev Minor number stride between devices. - */ - auto set_ids(size_t major, size_t minors_per_dev) -> void; - - /** - * @brief Return the assigned major number. - * @return Assigned major number. - */ - [[nodiscard]] auto major() const -> size_t; - - /** - * @brief Return the number of devices managed by this controller. - * @return Number of managed devices. - */ - [[nodiscard]] auto devices_count() const -> size_t; - - /** - * @brief Return all devices managed by this controller. - * @return Vector of all managed devices. - */ - [[nodiscard]] auto all_devices() const -> kstd::vector> const &; - - /** - * @brief Find a managed device by major/minor numbers. - * @param major Device major number. - * @param minor Device minor number. - * @return Matching block device, or nullptr if no device matches. - */ - [[nodiscard]] auto device_by_minor(size_t minor) const -> kstd::shared_ptr; - - protected: - size_t m_major{}; - size_t m_minors_per_device{}; - kstd::vector> m_devices{}; - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_management.hpp b/kernel/devices/include/devices/storage/storage_management.hpp deleted file mode 100644 index f8ffda8..0000000 --- a/kernel/devices/include/devices/storage/storage_management.hpp +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP - -#include "devices/device.hpp" -#include "devices/storage/storage_controller.hpp" - -#include -#include - -#include - -namespace devices::storage -{ - /** - * @brief Global storage subsystem manager. - * - * Owns registered storage controllers and provides device lookup by - * major/minor numbers. - */ - struct storage_management - { - /** - * @brief Initialize global storage management. - * - * Creates the singleton instance, registers controllers and probes - * them for devices. - * - * @warning Panics if called more than once. - */ - auto static init() -> void; - - /** - * @brief Return the active storage manager singleton. - * @return Reference to the active storage manager. - * @warning Panics if storage management has not been initialized. - */ - auto static get() -> storage_management &; - - /** - * @brief Register a storage controller. - * @param controller Controller to register. - * - * Assigns controller IDs (major number range and minors per device). - */ - auto add_controller(kstd::shared_ptr const & controller) -> void; - - /** - * @brief Return all registered storage controllers. - * @return Vector of all registered storage controllers. - */ - [[nodiscard]] auto all_controllers() const -> kstd::vector> const &; - - /** - * @brief Find a device by major/minor numbers. - * @param major Device major number. - * @param minor Device minor number. - * @return Matching device, or nullptr if no device matches. - */ - auto device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr; - - /** - * @brief Determine the boot device. - * @return Boot device, or nullptr if it cannot be determined. - */ - auto determine_boot_device() -> kstd::shared_ptr; - - private: - /** - * @brief Private default constructor for storage management singleton. - */ - storage_management() = default; - - kstd::vector> m_controllers{}; - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/src/block_device.cpp b/kernel/devices/src/block_device.cpp deleted file mode 100644 index 40f842a..0000000 --- a/kernel/devices/src/block_device.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "devices/block_device.hpp" - -#include "kapi/system.hpp" - -#include "devices/device.hpp" - -#include -#include - -namespace devices -{ - block_device::block_device(size_t major, size_t minor, std::string_view name, size_t block_size) - : device(major, minor, name) - , m_block_size(block_size) - { - if (m_block_size == 0) - { - kapi::system::panic("[DEVICES] block_device constructed with zero block size."); - } - } - - auto block_device::calculate_transfer(size_t block_index) const -> transfer_info - { - size_t const offset = block_index * m_block_size; - size_t const limit = size(); - - size_t const available = (offset < limit) ? (limit - offset) : 0; - size_t const to_transfer = (available < m_block_size) ? available : m_block_size; - - return {offset, to_transfer, m_block_size - to_transfer}; - } - - auto block_device::block_size() const -> size_t - { - return m_block_size; - } - - auto block_device::capacity() const -> size_t - { - return size(); - } -} // namespace devices \ No newline at end of file diff --git a/kernel/devices/src/device.cpp b/kernel/devices/src/device.cpp deleted file mode 100644 index 8184321..0000000 --- a/kernel/devices/src/device.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "devices/device.hpp" - -#include -#include - -namespace devices -{ - device::device(size_t major, size_t minor, std::string_view name) - : m_major(major) - , m_minor(minor) - , m_name(name) - {} - - auto device::major() const -> size_t - { - return m_major; - } - - auto device::minor() const -> size_t - { - return m_minor; - } - - auto device::name() const -> std::string_view - { - return m_name; - } -} // namespace devices \ No newline at end of file diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp deleted file mode 100644 index 3d14faf..0000000 --- a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "devices/storage/ram_disk/ram_disk_controller.hpp" - -#include "kapi/boot_module/boot_module_registry.hpp" - -#include "devices/storage/ram_disk/ram_disk_device.hpp" - -#include -#include - -#include -#include - -namespace devices::storage::ram_disk -{ - ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry) - : m_boot_module_registry(registry) - {} - - auto ram_disk_controller::probe() -> void - { - size_t current_device_index = 0; - - std::ranges::for_each(*m_boot_module_registry, [this, ¤t_device_index](auto const & module) { - auto const minor = current_device_index++ * m_minors_per_device; - m_devices.push_back(kstd::make_shared(module, m_major, minor)); - }); - } -} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp deleted file mode 100644 index 91a278e..0000000 --- a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "devices/storage/ram_disk/ram_disk_device.hpp" - -#include "kapi/boot_module/boot_module.hpp" -#include "kapi/system.hpp" - -#include "devices/block_device.hpp" - -#include - -#include -#include -#include - -namespace devices::storage::ram_disk -{ - namespace - { - constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz; - - // TODO BA-FS26 @Felix - // TODO BA-FS26 currently only names for 9 minor devices - constinit std::array name = {'r', 'a', 'm', '0', '\0'}; - - auto determine_device_name(size_t minor) -> std::string_view - { - name[3] = '0' + minor; - return std::string_view{name}; - } - } // namespace - - ram_disk_device::ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor) - : block_device(major, minor, determine_device_name(minor), RAM_DISK_BLOCK_SIZE) - , m_boot_module(module) - {} - - auto ram_disk_device::read_block(size_t block_index, void * buffer) const -> void - { - if (buffer == nullptr) - { - kapi::system::panic("[RAM DISK DEVICE] read_block called with null buffer."); - } - - auto const info = calculate_transfer(block_index); - - if (info.to_transfer > 0) - { - auto const src = static_cast(m_boot_module.start_address) + info.offset; - kstd::libc::memcpy(buffer, src, info.to_transfer); - } - - if (info.remainder > 0) - { - kstd::libc::memset(static_cast(buffer) + info.to_transfer, 0, info.remainder); - } - } - - auto ram_disk_device::write_block(size_t block_index, void const * buffer) -> void - { - if (buffer == nullptr) - { - kapi::system::panic("[RAM DISK DEVICE] write_block called with null buffer."); - } - - auto const info = calculate_transfer(block_index); - - if (info.to_transfer > 0) - { - auto const dest = static_cast(m_boot_module.start_address) + info.offset; - kstd::libc::memcpy(dest, buffer, info.to_transfer); - } - } - - auto ram_disk_device::size() const -> size_t - { - return m_boot_module.size; - } -} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/storage_controller.cpp b/kernel/devices/src/storage/storage_controller.cpp deleted file mode 100644 index 16d40f4..0000000 --- a/kernel/devices/src/storage/storage_controller.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "devices/storage/storage_controller.hpp" - -#include "devices/device.hpp" - -#include -#include - -#include -#include - -namespace devices::storage -{ - auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void - { - m_major = major; - m_minors_per_device = minors_per_dev; - } - - auto storage_controller::major() const -> size_t - { - return m_major; - } - - auto storage_controller::device_by_minor(size_t minor) const -> kstd::shared_ptr - { - auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device->minor() == minor; }); - - if (it != m_devices.end()) - { - return *it; - } - return nullptr; - } - - auto storage_controller::devices_count() const -> size_t - { - return m_devices.size(); - } - - auto storage_controller::all_devices() const -> kstd::vector> const & - { - return m_devices; - } -} // namespace devices::storage \ No newline at end of file diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/devices/src/storage/storage_management.cpp deleted file mode 100644 index 25885ad..0000000 --- a/kernel/devices/src/storage/storage_management.cpp +++ /dev/null @@ -1,85 +0,0 @@ -#include "devices/storage/storage_management.hpp" - -#include "kapi/boot_modules.hpp" -#include "kapi/system.hpp" - -#include "devices/device.hpp" -#include "devices/storage/ram_disk/ram_disk_controller.hpp" -#include "devices/storage/storage_controller.hpp" - -#include -#include - -#include -#include -#include - -namespace devices::storage -{ - namespace - { - constexpr size_t static MINORS_PER_DEVICE = 16; - constexpr size_t static START_MAJOR = 1; - constinit size_t static next_free_major = START_MAJOR; - - constinit auto static active_storage_management = std::optional{}; - } // namespace - - auto storage_management::init() -> void - { - if (active_storage_management) - { - kapi::system::panic("[DEVICES] Storage management has already been initialized."); - } - active_storage_management.emplace(storage_management{}); - - auto current_ram_disk_controller = - kstd::make_shared(&kapi::boot_modules::get_boot_module_registry()); - active_storage_management->add_controller(current_ram_disk_controller); - - std::ranges::for_each(active_storage_management->m_controllers, [](auto controller) { controller->probe(); }); - } - - auto storage_management::get() -> storage_management & - { - if (!active_storage_management) - { - kapi::system::panic("[DEVICES] Storage management has not been initialized."); - } - - return *active_storage_management; - } - - auto storage_management::add_controller(kstd::shared_ptr const & controller) -> void - { - controller->set_ids(next_free_major++, MINORS_PER_DEVICE); - m_controllers.push_back(controller); - } - - auto storage_management::all_controllers() const -> kstd::vector> const & - { - return m_controllers; - } - - auto storage_management::device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr - { - kstd::shared_ptr found = nullptr; - - std::ranges::find_if(m_controllers, [&](auto const & controller) { - if (controller != nullptr && controller->major() == major) - { - found = controller->device_by_minor(minor); - return found != nullptr; - } - return false; - }); - - return found; - } - - auto storage_management::determine_boot_device() -> kstd::shared_ptr - { - return device_by_major_minor(START_MAJOR, 0); - } - -} // namespace devices::storage \ No newline at end of file diff --git a/kernel/filesystem/CMakeLists.txt b/kernel/filesystem/CMakeLists.txt deleted file mode 100644 index bb2090a..0000000 --- a/kernel/filesystem/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -add_library("kernel_filesystem" STATIC) -add_library("kernel::filesystem" ALIAS "kernel_filesystem") - -target_sources("kernel_filesystem" PRIVATE - "src/ext2/ext2_filesystem.cpp" - "src/custody.cpp" - "src/device_file.cpp" - "src/file_descriptor_table.cpp" - "src/filesystem.cpp" - "src/inode_file.cpp" - "src/inode.cpp" - "src/mount.cpp" - "src/open_file_description.cpp" - "src/vfs.cpp" -) - -target_sources("kernel_filesystem" PUBLIC - FILE_SET HEADERS - BASE_DIRS "include" - FILES - "include/filesystem/ext2/ext2_filesystem.hpp" - "include/filesystem/custody.hpp" - "include/filesystem/device_file.hpp" - "include/filesystem/file_descriptor_table.hpp" - "include/filesystem/file.hpp" - "include/filesystem/filesystem.hpp" - "include/filesystem/inode_file.hpp" - "include/filesystem/inode_metadata.hpp" - "include/filesystem/inode.hpp" - "include/filesystem/mount.hpp" - "include/filesystem/open_file_description.hpp" - "include/filesystem/vfs.hpp" -) - -target_include_directories("kernel_filesystem" PUBLIC - "include" -) - -target_link_libraries("kernel_filesystem" PUBLIC - "kernel::devices" -PRIVATE - "os::kapi" -) diff --git a/kernel/filesystem/include/filesystem/custody.hpp b/kernel/filesystem/include/filesystem/custody.hpp deleted file mode 100644 index 0124eb6..0000000 --- a/kernel/filesystem/include/filesystem/custody.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef TEACH_OS_KERNEL_CUSTODY_HPP -#define TEACH_OS_KERNEL_CUSTODY_HPP - -#include "filesystem/inode.hpp" - -#include - -namespace filesystem -{ - struct custody - { - custody(kstd::shared_ptr const & parent, kstd::shared_ptr const & node); - - [[nodiscard]] auto get_inode() const -> kstd::shared_ptr const &; - [[nodiscard]] auto get_parent() const -> kstd::shared_ptr const &; - - private: - kstd::shared_ptr m_parent; - kstd::shared_ptr m_inode; - }; -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/device_file.hpp b/kernel/filesystem/include/filesystem/device_file.hpp deleted file mode 100644 index dad4ea5..0000000 --- a/kernel/filesystem/include/filesystem/device_file.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVICE_FILE_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_DEVICE_FILE_HPP - -#include "devices/block_device.hpp" -#include "devices/device.hpp" -#include "filesystem/file.hpp" - -#include - -#include - -namespace filesystem -{ - struct device_file : file - { - explicit device_file(kstd::shared_ptr const & device); - - auto open() -> void override; - - 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: - using block_op = void (*)(size_t idx, size_t off, size_t len, size_t done, devices::block_device * device, - std::byte * scratch, void * buffer); - auto process_blocks(size_t offset, size_t size, void * buffer, block_op op) const -> size_t; - - kstd::shared_ptr m_device; - }; -} // namespace filesystem - -#endif diff --git a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp b/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp deleted file mode 100644 index 37448a1..0000000 --- a/kernel/filesystem/include/filesystem/ext2/ext2_filesystem.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_EXT2_FILESYSTEM_HPP - -#include "devices/device.hpp" -#include "filesystem/filesystem.hpp" -#include "filesystem/inode.hpp" - -#include - -#include - -namespace filesystem::ext2 -{ - struct ext2_filesystem : filesystem - { - auto mount(kstd::shared_ptr const & device) -> int override; - auto lookup(inode const & parent, std::string_view name) -> inode * override; - - private: - kstd::shared_ptr m_device{}; - }; -} // namespace filesystem::ext2 - -#endif diff --git a/kernel/filesystem/include/filesystem/file.hpp b/kernel/filesystem/include/filesystem/file.hpp deleted file mode 100644 index e7e1b12..0000000 --- a/kernel/filesystem/include/filesystem/file.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_FILE_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_FILE_HPP - -#include - -namespace filesystem -{ - struct file - { - virtual ~file() = default; - - virtual auto open() -> void = 0; - - 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; - }; -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/file_descriptor_table.hpp b/kernel/filesystem/include/filesystem/file_descriptor_table.hpp deleted file mode 100644 index 6d78532..0000000 --- a/kernel/filesystem/include/filesystem/file_descriptor_table.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_FILE_DESCRIPTOR_TABLE_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_FILE_DESCRIPTOR_TABLE_HPP - -#include "open_file_description.hpp" - -#include - -#include - -namespace filesystem -{ - struct file_descriptor_table - { - auto static init() -> void; - auto static get() -> file_descriptor_table &; - - ~file_descriptor_table() = default; - - auto add_file(open_file_description & f) -> int; - [[nodiscard]] auto get_file(int fd) const -> std::optional; - auto remove_file(int fd) -> void; - - private: - file_descriptor_table() = default; - - // TODO BA-FS26 use kstd::shared_ptr when available - kstd::vector> m_open_files{}; - }; -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/filesystem.hpp b/kernel/filesystem/include/filesystem/filesystem.hpp deleted file mode 100644 index 934f883..0000000 --- a/kernel/filesystem/include/filesystem/filesystem.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_FILESYSTEM_HPP - -#include "devices/device.hpp" -#include "filesystem/inode.hpp" - -#include - -#include - -namespace filesystem -{ - struct filesystem - { - virtual ~filesystem() = default; - - virtual auto mount(kstd::shared_ptr const & device) -> int = 0; - virtual auto lookup(inode const & parent, std::string_view name) -> inode * = 0; - - [[nodiscard]] auto root_inode() const -> inode const &; - - protected: - inode m_root_inode{}; // TODO BA-FS26 set during mount? - }; - -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/inode.hpp b/kernel/filesystem/include/filesystem/inode.hpp deleted file mode 100644 index abfe2cf..0000000 --- a/kernel/filesystem/include/filesystem/inode.hpp +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_INODE_HPP - -#include "devices/device.hpp" -#include "filesystem/inode_metadata.hpp" - -#include - -#include - -namespace filesystem -{ - struct inode - { - inode() = default; - explicit inode(inode_kind kind); - explicit inode(kstd::shared_ptr const & device); - - [[nodiscard]] auto metadata() const -> inode_metadata; - - [[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 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; - - private: - inode_kind m_kind{inode_kind::regular}; - kstd::shared_ptr m_device{}; - }; -} // namespace filesystem - -#endif diff --git a/kernel/filesystem/include/filesystem/inode_file.hpp b/kernel/filesystem/include/filesystem/inode_file.hpp deleted file mode 100644 index 5f8a95e..0000000 --- a/kernel/filesystem/include/filesystem/inode_file.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_INODE_FILE_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_INODE_FILE_HPP - -#include "filesystem/file.hpp" -#include "filesystem/inode.hpp" - -#include - -#include - -namespace filesystem -{ - struct inode_file : file - { - explicit inode_file(kstd::shared_ptr const & inode); - - auto open() -> void override; - - 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 m_inode; - }; -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/inode_metadata.hpp b/kernel/filesystem/include/filesystem/inode_metadata.hpp deleted file mode 100644 index ed5a09d..0000000 --- a/kernel/filesystem/include/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 -#include - -namespace filesystem -{ - enum class inode_kind - { - regular, - directory, - device - }; - - struct inode_metadata - { - inode_kind kind{inode_kind::regular}; - std::optional major{}; - std::optional minor{}; - }; -} // namespace filesystem - -#endif // TEACH_OS_KERNEL_FILESYSTEM_INODE_METADATA_HPP \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/mount.hpp b/kernel/filesystem/include/filesystem/mount.hpp deleted file mode 100644 index 46a68e2..0000000 --- a/kernel/filesystem/include/filesystem/mount.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_MOUNT_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_MOUNT_HPP - -#include "filesystem/filesystem.hpp" - -#include - -#include - -namespace filesystem -{ - struct mount - { - mount(std::string_view const & path, kstd::shared_ptr const & fs); - - [[nodiscard]] auto path() const -> std::string_view; - [[nodiscard]] auto get_filesystem() const -> kstd::shared_ptr const &; - - private: - std::string_view m_path; - kstd::shared_ptr m_filesystem{}; - }; -} // namespace filesystem - -#endif diff --git a/kernel/filesystem/include/filesystem/open_file_description.hpp b/kernel/filesystem/include/filesystem/open_file_description.hpp deleted file mode 100644 index 5ff094d..0000000 --- a/kernel/filesystem/include/filesystem/open_file_description.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_OPEN_FILE_DESCRIPTION_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_OPEN_FILE_DESCRIPTION_HPP - -#include "file.hpp" - -#include - -#include - -namespace filesystem -{ - struct open_file_description - { - open_file_description(kstd::shared_ptr const & file); - - ~open_file_description() = default; - - auto read(void * buffer, size_t size) -> size_t; - auto write(void const * buffer, size_t size) -> size_t; - - private: - kstd::shared_ptr m_file; - size_t m_offset; - }; - -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/include/filesystem/vfs.hpp b/kernel/filesystem/include/filesystem/vfs.hpp deleted file mode 100644 index e16a961..0000000 --- a/kernel/filesystem/include/filesystem/vfs.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP -#define TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP - -#include "devices/device.hpp" -#include "filesystem/custody.hpp" -#include "filesystem/ext2/ext2_filesystem.hpp" -#include "filesystem/inode.hpp" -#include "filesystem/mount.hpp" -#include "filesystem/open_file_description.hpp" - -#include -#include - -#include -#include - -namespace filesystem -{ - struct vfs - { - auto static init() -> void; - auto static get() -> vfs &; - - ~vfs() = default; - - auto open(std::string_view path) -> std::optional; - - private: - struct device_node_entry - { - std::string_view name; - kstd::shared_ptr node; - }; - - vfs() = default; - auto make_device_node(kstd::shared_ptr const & device) -> void; - [[nodiscard]] auto resolve_path(std::string_view path) -> std::optional; - - kstd::shared_ptr m_root_fs; - std::optional m_root_mount; - // kstd::vector m_mounts; // TODO BA-FS26 really needed? - kstd::vector> m_device_nodes; // TODO BA-FS26 remove again, use devtempfs - }; -} // namespace filesystem - -#endif \ No newline at end of file diff --git a/kernel/filesystem/src/custody.cpp b/kernel/filesystem/src/custody.cpp deleted file mode 100644 index 3a87345..0000000 --- a/kernel/filesystem/src/custody.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "filesystem/custody.hpp" - -#include "kapi/system.hpp" - -#include "filesystem/inode.hpp" - -#include - -namespace filesystem -{ - custody::custody(kstd::shared_ptr const & parent, kstd::shared_ptr const & node) - : m_parent(parent) - , m_inode(node) - { - if (!m_inode) - { - kapi::system::panic("[FILESYSTEM] custody constructed with null inode."); - } - } - - auto custody::get_inode() const -> kstd::shared_ptr const & - { - return m_inode; - } - - auto custody::get_parent() const -> kstd::shared_ptr const & - { - return m_parent; - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/device_file.cpp b/kernel/filesystem/src/device_file.cpp deleted file mode 100644 index 8fc159a..0000000 --- a/kernel/filesystem/src/device_file.cpp +++ /dev/null @@ -1,124 +0,0 @@ -#include "filesystem/device_file.hpp" - -#include "kapi/system.hpp" - -#include "devices/block_device.hpp" -#include "devices/device.hpp" - -#include -#include -#include - -#include -#include - -namespace filesystem -{ - device_file::device_file(kstd::shared_ptr const & device) - : m_device(device) - { - if (!m_device) - { - kapi::system::panic("[FILESYSTEM] device_file constructed with null device."); - } - } - - auto device_file::open() -> void - { - // Hook point for permission checks or lazy metadata loading. - } - - auto device_file::read(void * buffer, size_t offset, size_t size) const -> size_t - { - if (m_device->is_block_device()) - { - return process_blocks(offset, size, buffer, - [](size_t idx, size_t off, size_t len, size_t done, devices::block_device * device, - std::byte * scratch, void * buffer) { - auto * out = static_cast(buffer); - if (off == 0 && len == device->block_size()) - { - device->read_block(idx, out + done); - } - else - { - device->read_block(idx, scratch); - kstd::libc::memcpy(out + done, scratch + off, len); - } - }); - } - else - { - kapi::system::panic("[FILESYSTEM] device_file::read called on non-block device."); - } - } - - auto device_file::write(void const * buffer, size_t offset, size_t size) -> size_t - { - if (m_device->is_block_device()) - { - return process_blocks(offset, size, const_cast(buffer), - [](size_t idx, size_t off, size_t len, size_t done, devices::block_device * device, - std::byte * scratch, void * buffer) { - auto const * in = static_cast(buffer); - if (off == 0 && len == device->block_size()) - { - device->write_block(idx, in + done); - } - else - { - device->read_block(idx, scratch); - kstd::libc::memcpy(scratch + off, in + done, len); - device->write_block(idx, scratch); - } - }); - } - else - { - kapi::system::panic("[FILESYSTEM] device_file::write called on non-block device."); - } - } - - auto device_file::process_blocks(size_t offset, size_t size, void * buffer, block_op op) const -> size_t - { - if (buffer == nullptr) - { - kapi::system::panic("[FILESYSTEM] device_file::write called with null buffer."); - } - - if (size == 0) - { - return 0; - } - - auto * block_dev = static_cast(m_device.get()); - if (block_dev == nullptr) - { - kapi::system::panic("[FILESYSTEM] device_file: expected block_device."); - } - - size_t const block_size = block_dev->block_size(); - size_t const capacity = block_dev->capacity(); - - if (offset >= capacity) - return 0; - size_t const total_to_process = std::min(size, capacity - offset); - - kstd::vector scratch_buffer{block_size}; - auto processed = 0uz; - - while (processed < total_to_process) - { - size_t const absolute_offset = offset + processed; - size_t const block_index = absolute_offset / block_size; - size_t const in_block_offset = absolute_offset % block_size; - size_t const chunk_size = std::min(total_to_process - processed, block_size - in_block_offset); - - op(block_index, in_block_offset, chunk_size, processed, block_dev, scratch_buffer.data(), buffer); - - processed += chunk_size; - } - - return processed; - } -} // namespace filesystem diff --git a/kernel/filesystem/src/ext2/ext2_filesystem.cpp b/kernel/filesystem/src/ext2/ext2_filesystem.cpp deleted file mode 100644 index a82a098..0000000 --- a/kernel/filesystem/src/ext2/ext2_filesystem.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "filesystem/ext2/ext2_filesystem.hpp" - -#include "devices/device.hpp" -#include "filesystem/inode.hpp" -#include "filesystem/inode_metadata.hpp" - -#include - -#include - -namespace filesystem::ext2 -{ - auto ext2_filesystem::mount(kstd::shared_ptr const & device) -> int - { - if (!device) - { - return -1; // TODO BA-FS26 panic or errorcode? - } - - m_device = device; - // TODO BA-FS26 load proper root inode from ext2 metadata - m_root_inode = inode{inode_kind::directory}; - - // TODO BA-FS26 implement - return 0; - } - - auto ext2_filesystem::lookup(inode const & /*parent*/, std::string_view /*name*/) -> inode * - { - // TODO BA-FS26 implement ext2 directory traversal and inode loading - return nullptr; - } -} // namespace filesystem::ext2 diff --git a/kernel/filesystem/src/file_descriptor_table.cpp b/kernel/filesystem/src/file_descriptor_table.cpp deleted file mode 100644 index 64fad0c..0000000 --- a/kernel/filesystem/src/file_descriptor_table.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "filesystem/file_descriptor_table.hpp" - -#include "kapi/system.hpp" - -#include "filesystem/open_file_description.hpp" - -#include -#include -#include - -namespace filesystem -{ - namespace - { - constinit auto static global_file_descriptor_table = std::optional{}; - } // namespace - - auto file_descriptor_table::init() -> void - { - if (global_file_descriptor_table) - { - kapi::system::panic("[FILESYSTEM] File descriptor table has already been initialized."); - } - - global_file_descriptor_table.emplace(file_descriptor_table{}); - } - - auto file_descriptor_table::get() -> file_descriptor_table & - { - if (!global_file_descriptor_table) - { - kapi::system::panic("[FILESYSTEM] File descriptor table has not been initialized."); - } - - return *global_file_descriptor_table; - } - - auto file_descriptor_table::add_file(open_file_description & file_description) -> int - { - auto it = std::ranges::find_if(m_open_files, [](auto & open_file) { return !open_file.has_value(); }); - if (it != m_open_files.end()) - { - *it = file_description; - return static_cast(it - m_open_files.begin()); - } - - m_open_files.push_back(file_description); - return static_cast(m_open_files.size() - 1); - } - - auto file_descriptor_table::get_file(int fd) const -> std::optional - { - if (fd < 0) - { - return std::nullopt; - } - - auto const index = static_cast(fd); - if (index >= m_open_files.size() || !m_open_files.at(fd).has_value()) - { - return std::nullopt; - } - - return m_open_files.at(fd); - } - - auto file_descriptor_table::remove_file(int fd) -> void - { - if (fd < 0) - { - return; - } - - auto const index = static_cast(fd); - if (index >= m_open_files.size()) - { - return; - } - - m_open_files.at(fd).reset(); - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/filesystem.cpp b/kernel/filesystem/src/filesystem.cpp deleted file mode 100644 index cdfe7f8..0000000 --- a/kernel/filesystem/src/filesystem.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "filesystem/filesystem.hpp" - -#include "filesystem/inode.hpp" - -namespace filesystem -{ - auto filesystem::root_inode() const -> inode const & - { - return m_root_inode; - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/inode.cpp b/kernel/filesystem/src/inode.cpp deleted file mode 100644 index 231ee33..0000000 --- a/kernel/filesystem/src/inode.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "filesystem/inode.hpp" - -#include "kapi/system.hpp" - -#include "devices/device.hpp" -#include "filesystem/inode_metadata.hpp" - -#include - -#include - -namespace filesystem -{ - inode::inode(inode_kind kind) - : m_kind(kind) - {} - - inode::inode(kstd::shared_ptr 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; - } - - auto inode::is_regular() const -> bool - { - return m_kind == inode_kind::regular; - } - - auto inode::is_device() const -> bool - { - 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 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/filesystem/src/inode_file.cpp b/kernel/filesystem/src/inode_file.cpp deleted file mode 100644 index 0b8bdf9..0000000 --- a/kernel/filesystem/src/inode_file.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "filesystem/inode_file.hpp" - -#include "kapi/system.hpp" - -#include "filesystem/inode.hpp" - -#include - -#include - -namespace filesystem -{ - inode_file::inode_file(kstd::shared_ptr const & inode) - : m_inode(inode) - { - if (!m_inode) - { - kapi::system::panic("[FILESYSTEM] inode_file constructed with null inode"); - } - } - - auto inode_file::open() -> void - { - // Hook point for permission checks or lazy metadata loading. - } - - auto inode_file::read(void * buffer, size_t offset, size_t size) const -> size_t - { - return m_inode->read(buffer, offset, size); - } - auto inode_file::write(void const * buffer, size_t offset, size_t size) -> size_t - { - return m_inode->write(buffer, offset, size); - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/mount.cpp b/kernel/filesystem/src/mount.cpp deleted file mode 100644 index 021b074..0000000 --- a/kernel/filesystem/src/mount.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "filesystem/mount.hpp" - -#include "kapi/system.hpp" - -#include "filesystem/filesystem.hpp" - -#include - -#include - -namespace filesystem -{ - mount::mount(std::string_view const & path, kstd::shared_ptr const & fs) - : m_path(path) - , m_filesystem(fs) - { - if (!m_filesystem) - { - kapi::system::panic("[FILESYSTEM] mount initialized with null filesystem."); - } - } - - auto mount::path() const -> std::string_view - { - return m_path; - } - - auto mount::get_filesystem() const -> kstd::shared_ptr const & - { - return m_filesystem; - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/open_file_description.cpp b/kernel/filesystem/src/open_file_description.cpp deleted file mode 100644 index cddee76..0000000 --- a/kernel/filesystem/src/open_file_description.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "filesystem/open_file_description.hpp" - -#include "filesystem/file.hpp" - -#include -#include - -#include - -namespace filesystem -{ - open_file_description::open_file_description(kstd::shared_ptr const & file) - : m_file(file) - , m_offset(0) - { - if (!file) - { - kstd::os::panic("[FILESYSTEM] open_file_description constructed with null file."); - } - } - - auto open_file_description::read(void * buffer, size_t size) -> size_t - { - auto read_bytes = m_file->read(buffer, m_offset, size); - m_offset += read_bytes; - return read_bytes; - } - - auto open_file_description::write(void const * buffer, size_t size) -> size_t - { - auto written_bytes = m_file->write(buffer, m_offset, size); - m_offset += written_bytes; - return written_bytes; - } -} // namespace filesystem \ No newline at end of file diff --git a/kernel/filesystem/src/vfs.cpp b/kernel/filesystem/src/vfs.cpp deleted file mode 100644 index c0f1c3a..0000000 --- a/kernel/filesystem/src/vfs.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include "filesystem/vfs.hpp" - -#include "kapi/system.hpp" - -#include "devices/device.hpp" -#include "devices/storage/storage_management.hpp" -#include "filesystem/custody.hpp" -#include "filesystem/device_file.hpp" -#include "filesystem/ext2/ext2_filesystem.hpp" -#include "filesystem/inode.hpp" -#include "filesystem/inode_file.hpp" -#include "filesystem/mount.hpp" -#include "filesystem/open_file_description.hpp" - -#include -#include - -#include -#include -#include - -namespace filesystem -{ - nam