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 --- arch/x86_64/arch/bus/isa.cpp | 12 +----------- arch/x86_64/arch/bus/isa.hpp | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'arch/x86_64') diff --git a/arch/x86_64/arch/bus/isa.cpp b/arch/x86_64/arch/bus/isa.cpp index 4df86a6d..11c5f3f5 100644 --- a/arch/x86_64/arch/bus/isa.cpp +++ b/arch/x86_64/arch/bus/isa.cpp @@ -41,17 +41,7 @@ namespace arch::bus } // namespace isa::isa() - : kapi::devices::bus{"isa"} + : kapi::devices::bus{"isa", protocol_instance} {} - auto isa::query_facet(kapi::capabilities::facet_id id) -> void * - { - if (id == kapi::devices::bus_protocol::id) - { - return static_cast(&protocol_instance); - } - - return bus::query_facet(id); - } - } // namespace arch::bus \ No newline at end of file diff --git a/arch/x86_64/arch/bus/isa.hpp b/arch/x86_64/arch/bus/isa.hpp index db85f3f7..fe2e83a6 100644 --- a/arch/x86_64/arch/bus/isa.hpp +++ b/arch/x86_64/arch/bus/isa.hpp @@ -42,9 +42,6 @@ namespace arch::bus { //! Construct a default ISA bus. isa(); - - private: - auto query_facet(kapi::capabilities::facet_id id) -> void * override; }; } // namespace arch::bus -- cgit v1.2.3