From ad43e9c9eac69b862789f2e132201cd5ceebaffa Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 26 Jul 2026 10:28:44 +0200 Subject: kapi: move protocol pointer to base bus --- kernel/kapi/devices/driver.tests.cpp | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'kernel/kapi/devices/driver.tests.cpp') diff --git a/kernel/kapi/devices/driver.tests.cpp b/kernel/kapi/devices/driver.tests.cpp index b935cc57..623f9d4c 100644 --- a/kernel/kapi/devices/driver.tests.cpp +++ b/kernel/kapi/devices/driver.tests.cpp @@ -47,17 +47,9 @@ namespace struct controller_bus final : kapi::devices::bus { - using kapi::devices::bus::bus; - - [[nodiscard]] auto query_facet(kapi::capabilities::facet_id facet) -> void * override - { - if (facet == kapi::devices::bus_protocol::id) - { - return static_cast(&controller_protocol_instance); - } - - return kapi::devices::bus::query_facet(facet); - } + controller_bus(kstd::string name) + : bus{name, controller_protocol_instance} + {} }; struct controller_device final : kapi::devices::bus, controller_identification @@ -142,17 +134,9 @@ namespace struct leaf_bus final : kapi::devices::bus { - using kapi::devices::bus::bus; - - [[nodiscard]] auto query_facet(kapi::capabilities::facet_id id) -> void * override - { - if (id == kapi::devices::bus_protocol::id) - { - return static_cast(&leaf_protocol_instance); - } - - return kapi::devices::bus::query_facet(id); - } + leaf_bus(kstd::string name) + : bus{name, leaf_protocol_instance} + {} }; struct controller_driver final : kapi::devices::driver, controller_driver_identification -- cgit v1.2.3