diff options
| author | Lukas Oesch <lukasoesch20@gmail.com> | 2026-03-15 16:49:07 +0100 |
|---|---|---|
| committer | Lukas Oesch <lukasoesch20@gmail.com> | 2026-03-17 16:43:07 +0100 |
| commit | 2af1bbc99e2a8fc4b86bb31023dbbb077b1cbc97 (patch) | |
| tree | 9946202a366b39893dede294d51e6b684ab730ba /kernel/devices/src/storage/ram_disk | |
| parent | 8eed4d31cf1d07d43e99d53da0fe3a401ce9e85e (diff) | |
| download | teachos-2af1bbc99e2a8fc4b86bb31023dbbb077b1cbc97.tar.xz teachos-2af1bbc99e2a8fc4b86bb31023dbbb077b1cbc97.zip | |
move m_devices from ram_disk_controller to storage_controller, store point to devices
Diffstat (limited to 'kernel/devices/src/storage/ram_disk')
| -rw-r--r-- | kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp index 9f9537f..b57dcfb 100644 --- a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp +++ b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp @@ -2,7 +2,6 @@ #include "kapi/boot_module/boot_module_registry.hpp" -#include "devices/block_device.hpp" #include "devices/storage/ram_disk/ram_disk_device.hpp" #include <kstd/print> @@ -10,9 +9,17 @@ #include <algorithm> #include <array> #include <cstddef> +#include <optional> namespace devices::storage::ram_disk { + namespace + { + // TODO BA-FS26 @Felix gibts besseren weg (ausser dynamic Memory) + // TODO BA-FS26 remove again, when dynamic memory available + constinit auto static active_ram_disk_device = std::optional<ram_disk_device>{}; + } // namespace + ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry) : m_boot_module_registry(registry) {} @@ -25,23 +32,8 @@ namespace devices::storage::ram_disk auto const minor = current_device_index++ * m_minors_per_device; // TODO BA-FS26 use push_back from kstd::vector when available - m_devices.at(0) = ram_disk_device{module, m_major, minor}; + active_ram_disk_device.emplace(module, m_major, minor); + m_devices.at(0) = &*active_ram_disk_device; }); } - - auto ram_disk_controller::device_by_minor(size_t minor) -> block_device * - { - 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 ram_disk_controller::devices_count() -> size_t - { - return m_devices.size(); - } } // namespace devices::storage::ram_disk
\ No newline at end of file |
