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/devices/src/storage/storage_management.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kernel/devices/src/storage/storage_management.cpp') diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/devices/src/storage/storage_management.cpp index a5b6503..a981359 100644 --- a/kernel/devices/src/storage/storage_management.cpp +++ b/kernel/devices/src/storage/storage_management.cpp @@ -3,7 +3,7 @@ #include "kapi/boot_modules.hpp" #include "kapi/system.hpp" -#include "devices/block_device.hpp" +#include "devices/device.hpp" #include "devices/storage/ram_disk/ram_disk_controller.hpp" #include "devices/storage/storage_controller.hpp" @@ -20,6 +20,7 @@ namespace devices::storage constinit size_t static next_free_major = START_MAJOR; constinit auto static active_storage_management = std::optional{}; + // TODO BA-FS26 remove again, when dynamic memory available constinit auto static active_ram_disk_controller = std::optional{}; } // namespace @@ -53,9 +54,9 @@ namespace devices::storage m_controllers.at(0) = controller; // TODO BA-FS26 use push_back from kstd:vector } - auto storage_management::device_by_major_minor(size_t major, size_t minor) -> block_device * + auto storage_management::device_by_major_minor(size_t major, size_t minor) -> device * { - block_device * found = nullptr; + device * found = nullptr; std::ranges::find_if(m_controllers, [&](auto const controller) { if (controller != nullptr && controller->major() == major) @@ -69,9 +70,8 @@ namespace devices::storage return found; } - auto storage_management::determine_boot_device() -> block_device * + auto storage_management::determine_boot_device() -> device * { - // TODO BA-FS26 better way? return device_by_major_minor(START_MAJOR, 0); } -- cgit v1.2.3