diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-07-21 17:27:05 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-07-21 17:27:05 +0200 |
| commit | 4539791823a2fb1506e9091ec5087c80a87adfde (patch) | |
| tree | c681ccdbb1664a5810b246bef08da20a34e61b30 /kernel/kapi/devices.cpp | |
| parent | b312d810400f9be112f13df670d92aebfddc10a9 (diff) | |
| download | kernel-4539791823a2fb1506e9091ec5087c80a87adfde.tar.xz kernel-4539791823a2fb1506e9091ec5087c80a87adfde.zip | |
kapi/device: remove major and minor
Diffstat (limited to 'kernel/kapi/devices.cpp')
| -rw-r--r-- | kernel/kapi/devices.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
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 <kstd/flat_map.hpp> #include <kstd/memory.hpp> #include <kstd/print.hpp> +#include <kstd/string.hpp> #include <atomic> #include <cstddef> @@ -21,7 +22,7 @@ namespace kapi::devices { auto constinit next_major_number = std::atomic_size_t{1}; auto constinit root_bus = std::optional<kernel::devices::root_bus>{}; - auto constinit device_tree = kstd::flat_map<std::pair<std::size_t, std::size_t>, kstd::observer_ptr<device>>{}; + auto constinit device_tree = kstd::flat_map<kstd::string, kstd::observer_ptr<device>>{}; } // 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<device> - { - 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<device> { for (auto const & [key, value] : device_tree) |
