kapi: let drivers choose their major number

3 files changed, 12 insertions, 7 deletions

diff --git a/kernel/kapi/devices/device.cpp b/kernel/kapi/devices/device.cpp
index cbbd5405..4c63f6a4 100644
--- a/kernel/kapi/devices/device.cpp
+++ b/kernel/kapi/devices/device.cpp
@@ -32,6 +32,11 @@ namespace kapi::devices
     m_state = state;
   }
 
+  auto device::bound_driver() const noexcept -> driver *
+  {
+    return m_driver.lock().get();
+  }
+
   auto device::bind_driver(kstd::weak_ptr<struct driver> driver) -> void
   {
     m_driver = driver;
diff --git a/kernel/kapi/devices/interface_registry.cpp b/kernel/kapi/devices/interface_registry.cpp
index 8882e8db..da3d080a 100644
--- a/kernel/kapi/devices/interface_registry.cpp
+++ b/kernel/kapi/devices/interface_registry.cpp
@@ -46,7 +46,7 @@ namespace kapi::devices
   auto interface_registry::do_publish(kstd::shared_ptr<device> device, kstd::string name, interface interface,
                                       void * implementation) -> kstd::result<void>
   {
-    erase_if(m_entries, [interface](auto e) { return e.interface() == interface && e.device().expired(); });
+    erase_if(m_entries, [interface](auto e) { return e.interface() == interface && !e.device(); });
 
     if (!device || !implementation || name.empty())
     {
@@ -54,7 +54,7 @@ namespace kapi::devices
     }
 
     auto published = std::ranges::any_of(m_entries, [&](auto const & entry) {
-      return entry.interface() == interface && entry.device().lock().get() == device.get();
+      return entry.interface() == interface && entry.device().get() == device.get();
     });
 
     if (published)
@@ -70,7 +70,7 @@ namespace kapi::devices
   auto interface_registry::unpublish(device const & device, interface interface) -> void
   {
     erase_if(m_entries, [&](auto e) {
-      auto locked_device = e.device().lock();
+      auto locked_device = e.device();
       return e.interface() == interface && locked_device && locked_device.get() == &device;
     });
   }
@@ -79,7 +79,7 @@ namespace kapi::devices
   {
     auto filtered = m_entries;
     erase_if(filtered, [&](auto e) {
-      auto locked_device = e.device().lock();
+      auto locked_device = e.device();
       return !(e.interface() == interface && locked_device);
     });
     return filtered;
@@ -88,7 +88,7 @@ namespace kapi::devices
   auto interface_registry::find(interface interface, std::string_view name) const -> kstd::result<entry>
   {
     auto found = std::ranges::find_if(
-        m_entries, [&](auto e) { return e.interface() == interface && e.name() == name && e.device().lock(); });
+        m_entries, [&](auto e) { return e.interface() == interface && e.name() == name && e.device(); });
     if (found == m_entries.cend())
     {
       return kstd::failure(make_error_code(kstd::errc::no_such_device));
diff --git a/kernel/kapi/devices/interface_registry.tests.cpp b/kernel/kapi/devices/interface_registry.tests.cpp
index 78cd7ecf..100954ea 100644
--- a/kernel/kapi/devices/interface_registry.tests.cpp
+++ b/kernel/kapi/devices/interface_registry.tests.cpp
@@ -114,9 +114,9 @@ SCENARIO("Publishing and finding a device", "[kapi][devices][interface_registry]
           REQUIRE(probeable_devices[0].name() == "probe0");
         }
 
-        THEN("the returned device pointer is lockable")
+        THEN("the returned device pointer is valid")
         {
-          REQUIRE(probeable_devices[0].device().lock());
+          REQUIRE(probeable_devices[0].device());
         }
 
         THEN("the returned implementation equals the result of device::as")