From 1eec1ed62987f34a8473db0ff2b89f82dd92ff4d Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 24 Jul 2026 19:37:41 +0200 Subject: kapi: rename interface to interface_id --- arch/x86_64/arch/bus/isa.hpp | 4 ++-- arch/x86_64/arch/devices/init.cpp | 1 - arch/x86_64/arch/devices/pit.cpp | 2 +- arch/x86_64/arch/devices/pit.hpp | 2 +- arch/x86_64/arch/drivers/pit.cpp | 2 +- arch/x86_64/arch/drivers/pit.hpp | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'arch/x86_64') diff --git a/arch/x86_64/arch/bus/isa.hpp b/arch/x86_64/arch/bus/isa.hpp index aa6eb01a..fa85c8e8 100644 --- a/arch/x86_64/arch/bus/isa.hpp +++ b/arch/x86_64/arch/bus/isa.hpp @@ -16,7 +16,7 @@ namespace arch::bus struct isa_identification { //! The ID of this interface. - constexpr auto static id = kapi::devices::interface{"isa_identification"}; + constexpr auto static id = kapi::devices::interface_id{"isa_identification"}; //! Allow for correct destruction through base pointers. virtual ~isa_identification() = default; @@ -27,7 +27,7 @@ namespace arch::bus struct isa_driver_identification { - constexpr auto static id = kapi::devices::interface{"isa_driver_identification"}; + constexpr auto static id = kapi::devices::interface_id{"isa_driver_identification"}; virtual ~isa_driver_identification() = default; diff --git a/arch/x86_64/arch/devices/init.cpp b/arch/x86_64/arch/devices/init.cpp index 10848508..03d082f6 100644 --- a/arch/x86_64/arch/devices/init.cpp +++ b/arch/x86_64/arch/devices/init.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include diff --git a/arch/x86_64/arch/devices/pit.cpp b/arch/x86_64/arch/devices/pit.cpp index df28288f..a280bcdc 100644 --- a/arch/x86_64/arch/devices/pit.cpp +++ b/arch/x86_64/arch/devices/pit.cpp @@ -18,7 +18,7 @@ namespace arch::devices return "pit"; } - auto pit::query_interface(kapi::devices::interface interface) -> void * + auto pit::query_interface(kapi::devices::interface_id interface) -> void * { if (interface == arch::bus::isa_identification::id) { diff --git a/arch/x86_64/arch/devices/pit.hpp b/arch/x86_64/arch/devices/pit.hpp index 5104087b..452eedc0 100644 --- a/arch/x86_64/arch/devices/pit.hpp +++ b/arch/x86_64/arch/devices/pit.hpp @@ -24,7 +24,7 @@ namespace arch::devices [[nodiscard]] auto isa_name() const -> std::string_view override; protected: - auto query_interface(kapi::devices::interface interface) -> void * override; + auto query_interface(kapi::devices::interface_id interface) -> void * override; }; } // namespace arch::devices diff --git a/arch/x86_64/arch/drivers/pit.cpp b/arch/x86_64/arch/drivers/pit.cpp index 2b03172d..6bad179e 100644 --- a/arch/x86_64/arch/drivers/pit.cpp +++ b/arch/x86_64/arch/drivers/pit.cpp @@ -87,7 +87,7 @@ namespace arch::drivers return kapi::interrupts::status::handled; } - auto pit::query_interface(kapi::devices::interface interface) -> void * + auto pit::query_interface(kapi::devices::interface_id interface) -> void * { if (interface == arch::bus::isa_driver_identification::id) { diff --git a/arch/x86_64/arch/drivers/pit.hpp b/arch/x86_64/arch/drivers/pit.hpp index f22c6037..6e51ec36 100644 --- a/arch/x86_64/arch/drivers/pit.hpp +++ b/arch/x86_64/arch/drivers/pit.hpp @@ -30,7 +30,7 @@ namespace arch::drivers auto handle_interrupt(std::uint32_t irq_number, kstd::weak_ptr context) -> kapi::interrupts::status override; protected: - auto query_interface(kapi::devices::interface interface) -> void * override; + auto query_interface(kapi::devices::interface_id interface) -> void * override; private: struct data -- cgit v1.2.3