From 8b942e15e2afad530ea5a4dc2855aa23833d8223 Mon Sep 17 00:00:00 2001 From: Hess Nathan Date: Tue, 25 Jun 2024 08:49:10 +0200 Subject: [PATCH] arch: x86: corrected parameter names - applied the exact parameter names of the interface to implementation Signed-off-by: Hess Nathan --- arch/x86/core/intel64/irq.c | 6 +++--- include/zephyr/arch/x86/arch.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/core/intel64/irq.c b/arch/x86/core/intel64/irq.c index f8e251b804613c..51410646dbaf94 100644 --- a/arch/x86/core/intel64/irq.c +++ b/arch/x86/core/intel64/irq.c @@ -100,8 +100,8 @@ void z_x86_irq_connect_on_vector(unsigned int irq, */ int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority, - void (*func)(const void *arg), - const void *arg, uint32_t flags) + void (*routine)(const void *parameter), + const void *parameter, uint32_t flags) { uint32_t key; int vector; @@ -124,7 +124,7 @@ int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority, #endif /* CONFIG_INTEL_VTD_ICTL */ z_irq_controller_irq_config(vector, irq, flags); - z_x86_irq_connect_on_vector(irq, vector, func, arg); + z_x86_irq_connect_on_vector(irq, vector, routine, parameter); } irq_unlock(key); diff --git a/include/zephyr/arch/x86/arch.h b/include/zephyr/arch/x86/arch.h index 61036288671c8b..90d2fa0c51a1a4 100644 --- a/include/zephyr/arch/x86/arch.h +++ b/include/zephyr/arch/x86/arch.h @@ -216,7 +216,7 @@ static ALWAYS_INLINE int sys_test_and_clear_bit(mem_addr_t addr, * at build time and defined via the linker script. On Intel64, it's an array. */ -extern unsigned char _irq_to_interrupt_vector[]; +extern unsigned char _irq_to_interrupt_vector[CONFIG_MAX_IRQ_LINES]; #define Z_IRQ_TO_INTERRUPT_VECTOR(irq) \ ((unsigned int) _irq_to_interrupt_vector[(irq)])