diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-07-21 17:33:13 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-07-21 17:33:13 +0200 |
| commit | 93de74017095f86a6c62447938ec6169a5184c45 (patch) | |
| tree | ff5087083a953e783ff43ea4b64944564b1d67ad /kernel | |
| parent | 4539791823a2fb1506e9091ec5087c80a87adfde (diff) | |
| download | kernel-93de74017095f86a6c62447938ec6169a5184c45.tar.xz kernel-93de74017095f86a6c62447938ec6169a5184c45.zip | |
kapi: remove major number allocator
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kapi/devices.cpp | 9 | ||||
| -rw-r--r-- | kernel/kernel/devices/storage/management.cpp | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/kernel/kapi/devices.cpp b/kernel/kapi/devices.cpp index ae2d4d7a..6da503d9 100644 --- a/kernel/kapi/devices.cpp +++ b/kernel/kapi/devices.cpp @@ -10,8 +10,6 @@ #include <kstd/print.hpp> #include <kstd/string.hpp> -#include <atomic> -#include <cstddef> #include <optional> #include <string_view> #include <utility> @@ -20,7 +18,6 @@ namespace kapi::devices { namespace { - 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<kstd::string, kstd::observer_ptr<device>>{}; } // namespace @@ -48,11 +45,6 @@ namespace kapi::devices return *root_bus; } - auto allocate_major_number() -> std::size_t - { - return next_major_number.fetch_add(1, std::memory_order::relaxed); - } - auto register_device(device & device) -> bool { kstd::println("[OS:DEV] Registering device {}", device.name()); @@ -86,6 +78,5 @@ namespace kapi::test_support::devices deinit_interface_registry(); kapi::devices::root_bus.reset(); - kapi::devices::next_major_number = 1; } } // namespace kapi::test_support::devices
\ No newline at end of file diff --git a/kernel/kernel/devices/storage/management.cpp b/kernel/kernel/devices/storage/management.cpp index 227aa54e..2c42fbd3 100644 --- a/kernel/kernel/devices/storage/management.cpp +++ b/kernel/kernel/devices/storage/management.cpp @@ -50,7 +50,8 @@ namespace kernel::devices::storage auto management::add_controller(kstd::shared_ptr<controller> const & controller) -> void { - controller->set_ids(kapi::devices::allocate_major_number(), minors_per_device); + // TODO: remove the major argument + controller->set_ids(0, minors_per_device); m_controllers.push_back(controller); } |
