use kstd::vector instead of std::array and replace plain-pointers with kstd::shared_ptr

4 files changed, 20 insertions, 32 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 b57dcfb..3d14faf 100644
--- a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp
+++ b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp
@@ -4,22 +4,14 @@
 
 #include "devices/storage/ram_disk/ram_disk_device.hpp"
 
+#include <kstd/memory>
 #include <kstd/print>
 
 #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)
   {}
@@ -30,10 +22,7 @@ namespace devices::storage::ram_disk
 
     std::ranges::for_each(*m_boot_module_registry, [this, &current_device_index](auto const & module) {
       auto const minor = current_device_index++ * m_minors_per_device;
-
-      // TODO BA-FS26 use push_back from kstd::vector when available
-      active_ram_disk_device.emplace(module, m_major, minor);
-      m_devices.at(0) = &*active_ram_disk_device;
+      m_devices.push_back(kstd::make_shared<ram_disk_device>(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
index 774e949..6ff2a83 100644
--- a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp
+++ b/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp
@@ -28,10 +28,6 @@ namespace devices::storage::ram_disk
     }
   }  // namespace
 
-  ram_disk_device::ram_disk_device()  // TODO BA-FS26 remove when kstd::vector is available
-      : block_device(0, 0, determine_device_name(0), RAM_DISK_BLOCK_SIZE)
-  {}
-
   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)
diff --git a/kernel/devices/src/storage/storage_controller.cpp b/kernel/devices/src/storage/storage_controller.cpp
index d9bc806..16d40f4 100644
--- a/kernel/devices/src/storage/storage_controller.cpp
+++ b/kernel/devices/src/storage/storage_controller.cpp
@@ -2,8 +2,10 @@
 
 #include "devices/device.hpp"
 
+#include <kstd/memory>
+#include <kstd/vector>
+
 #include <algorithm>
-#include <array>
 #include <cstddef>
 
 namespace devices::storage
@@ -19,7 +21,7 @@ namespace devices::storage
     return m_major;
   }
 
-  auto storage_controller::device_by_minor(size_t minor) const -> device *
+  auto storage_controller::device_by_minor(size_t minor) const -> kstd::shared_ptr<devices::device>
   {
     auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device->minor() == minor; });
 
@@ -35,7 +37,7 @@ namespace devices::storage
     return m_devices.size();
   }
 
-  auto storage_controller::all_devices() const -> std::array<devices::device *, 1> const &
+  auto storage_controller::all_devices() const -> kstd::vector<kstd::shared_ptr<devices::device>> const &
   {
     return m_devices;
   }
diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/devices/src/storage/storage_management.cpp
index e1f1bcc..00449fb 100644
--- a/kernel/devices/src/storage/storage_management.cpp
+++ b/kernel/devices/src/storage/storage_management.cpp
@@ -7,8 +7,10 @@
 #include "devices/storage/ram_disk/ram_disk_controller.hpp"
 #include "devices/storage/storage_controller.hpp"
 
+#include <kstd/memory>
+#include <kstd/vector>
+
 #include <algorithm>
-#include <array>
 #include <cstddef>
 #include <optional>
 
@@ -21,8 +23,6 @@ namespace devices::storage
     constinit size_t static next_free_major = START_MAJOR;
 
     constinit auto static active_storage_management = std::optional<storage_management>{};
-    // TODO BA-FS26 remove again, when dynamic memory available
-    constinit auto static active_ram_disk_controller = std::optional<ram_disk::ram_disk_controller>{};
   }  // namespace
 
   auto storage_management::init() -> void
@@ -33,8 +33,9 @@ namespace devices::storage
     }
     active_storage_management.emplace(storage_management{});
 
-    active_ram_disk_controller.emplace(&kapi::boot_modules::get_boot_module_registry());
-    active_storage_management->add_controller(&active_ram_disk_controller.value());
+    auto current_ram_disk_controller =
+        kstd::make_shared<ram_disk::ram_disk_controller>(&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(); });
   }
@@ -49,22 +50,22 @@ namespace devices::storage
     return *active_storage_management;
   }
 
-  auto storage_management::add_controller(storage_controller * controller) -> void
+  auto storage_management::add_controller(kstd::shared_ptr<storage_controller> controller) -> void
   {
     controller->set_ids(next_free_major++, MINORS_PER_DEVICE);
-    m_controllers.at(0) = controller;  // TODO BA-FS26 use push_back from kstd:vector
+    m_controllers.push_back(controller);
   }
 
-  auto storage_management::all_controllers() const -> std::array<storage_controller *, 1> const &
+  auto storage_management::all_controllers() const -> kstd::vector<kstd::shared_ptr<storage_controller>> const &
   {
     return m_controllers;
   }
 
-  auto storage_management::device_by_major_minor(size_t major, size_t minor) -> device *
+  auto storage_management::device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr<device>
   {
-    device * found = nullptr;
+    kstd::shared_ptr<device> found = nullptr;
 
-    std::ranges::find_if(m_controllers, [&](auto const controller) {
+    std::ranges::find_if(m_controllers, [&](auto const & controller) {
       if (controller != nullptr && controller->major() == major)
       {
         found = controller->device_by_minor(minor);
@@ -76,7 +77,7 @@ namespace devices::storage
     return found;
   }
 
-  auto storage_management::determine_boot_device() -> device *
+  auto storage_management::determine_boot_device() -> kstd::shared_ptr<device>
   {
     return device_by_major_minor(START_MAJOR, 0);
   }