From 4539791823a2fb1506e9091ec5087c80a87adfde Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 21 Jul 2026 17:27:05 +0200 Subject: kapi/device: remove major and minor --- kernel/kapi/devices.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'kernel/kapi/devices.cpp') diff --git a/kernel/kapi/devices.cpp b/kernel/kapi/devices.cpp index ef72c667..ae2d4d7a 100644 --- a/kernel/kapi/devices.cpp +++ b/kernel/kapi/devices.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -21,7 +22,7 @@ namespace kapi::devices { auto constinit next_major_number = std::atomic_size_t{1}; auto constinit root_bus = std::optional{}; - auto constinit device_tree = kstd::flat_map, kstd::observer_ptr>{}; + auto constinit device_tree = kstd::flat_map>{}; } // namespace auto init() -> void @@ -54,8 +55,8 @@ namespace kapi::devices auto register_device(device & device) -> bool { - kstd::println("[OS:DEV] Registering device {}@{}:{}", device.name(), device.major(), device.minor()); - return device_tree.emplace(std::pair{device.major(), device.minor()}, &device).second; + kstd::println("[OS:DEV] Registering device {}", device.name()); + return device_tree.emplace(device.name(), &device).second; } auto unregister_device(device &) -> bool @@ -64,15 +65,6 @@ namespace kapi::devices return false; } - auto find_device(std::size_t major, std::size_t minor) -> kstd::observer_ptr - { - if (device_tree.contains(std::pair{major, minor})) - { - return device_tree.at(std::pair{major, minor}); - } - return nullptr; - } - auto find_device(std::string_view name) -> kstd::observer_ptr { for (auto const & [key, value] : device_tree) -- cgit v1.2.3