aboutsummaryrefslogtreecommitdiff
path: root/kernel/devices/src
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/devices/src')
-rw-r--r--kernel/devices/src/Device.cpp13
-rw-r--r--kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp15
-rw-r--r--kernel/devices/src/storage/StorageManagement.cpp12
3 files changed, 37 insertions, 3 deletions
diff --git a/kernel/devices/src/Device.cpp b/kernel/devices/src/Device.cpp
index d755fb9..48ba29b 100644
--- a/kernel/devices/src/Device.cpp
+++ b/kernel/devices/src/Device.cpp
@@ -1,6 +1,17 @@
#include "devices/Device.hpp"
+#include <cstddef>
+
namespace devices
{
- // TODO BA-FS26 implement device functionality
+
+ auto device::major() const -> size_t
+ {
+ return m_major;
+ }
+
+ auto device::minor() const -> size_t
+ {
+ return m_minor;
+ }
} // namespace devices \ No newline at end of file
diff --git a/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp b/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp
index 90a7c0f..ec2cb97 100644
--- a/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp
+++ b/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp
@@ -3,12 +3,15 @@
#include "kapi/boot_module/boot_module.hpp"
#include "kapi/boot_module/boot_module_registry.hpp"
+#include "devices/BlockDevice.hpp"
#include "devices/storage/RAMDisk/RAMDiskDevice.hpp"
#include <kstd/print>
#include <algorithm>
+#include <array>
#include <cstddef>
+#include <cstdint>
namespace devices::storage::ram_disk
{
@@ -27,6 +30,18 @@ namespace devices::storage::ram_disk
m_devices.at(0) = ram_disk_device{module};
}
+ auto ram_disk_controller::device_by_major_minor(size_t major, size_t minor) -> block_device *
+ {
+ auto it = std::ranges::find_if(
+ m_devices, [major, minor](auto const & device) { return device.major() == major && device.minor() == minor; });
+
+ if (it != m_devices.end())
+ {
+ return &(*it);
+ }
+ return nullptr;
+ }
+
auto ram_disk_controller::devices_count() -> size_t
{
return m_devices.size();
diff --git a/kernel/devices/src/storage/StorageManagement.cpp b/kernel/devices/src/storage/StorageManagement.cpp
index 2daae0a..cfc5239 100644
--- a/kernel/devices/src/storage/StorageManagement.cpp
+++ b/kernel/devices/src/storage/StorageManagement.cpp
@@ -8,6 +8,7 @@
#include "devices/storage/StorageController.hpp"
#include <algorithm>
+#include <cstddef>
#include <optional>
namespace devices::storage
@@ -47,9 +48,16 @@ namespace devices::storage
m_controllers.at(0) = controller; // TODO BA-FS26 use push_back from kstd:vector
}
- auto storage_management::add_device(block_device * device) -> void
+ auto storage_management::device_by_major_minor(size_t major, size_t minor) -> block_device *
{
- m_devices.at(0) = device; // TODO BA-FS26 use push_back from kstd:vector
+ block_device * found = nullptr;
+
+ std::ranges::find_if(m_controllers, [&](auto const controller) {
+ found = controller->device_by_major_minor(major, minor);
+ return found != nullptr;
+ });
+
+ return found;
}
} // namespace devices::storage \ No newline at end of file