From 049e2b64e142ef23d7901d22c4ee6c5b87e8c3ee Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 19 Jun 2021 12:53:27 +0200 Subject: bsps/irq: Remove BSP_INTERRUPT_VECTOR_NUMBER Replace it with BSP_INTERRUPT_VECTOR_COUNT. Update #3269. --- bsps/include/bsp/irq-generic.h | 4 +--- bsps/shared/irq/irq-generic.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'bsps') diff --git a/bsps/include/bsp/irq-generic.h b/bsps/include/bsp/irq-generic.h index 31010d1c08..749dc78988 100644 --- a/bsps/include/bsp/irq-generic.h +++ b/bsps/include/bsp/irq-generic.h @@ -74,10 +74,8 @@ extern "C" { #error "if you define BSP_INTERRUPT_USE_INDEX_TABLE, you have to define BSP_INTERRUPT_HANDLER_TABLE_SIZE etc. as well" #endif -#define BSP_INTERRUPT_VECTOR_NUMBER (BSP_INTERRUPT_VECTOR_MAX + 1) - #ifndef BSP_INTERRUPT_HANDLER_TABLE_SIZE - #define BSP_INTERRUPT_HANDLER_TABLE_SIZE BSP_INTERRUPT_VECTOR_NUMBER + #define BSP_INTERRUPT_HANDLER_TABLE_SIZE BSP_INTERRUPT_VECTOR_COUNT #endif /* Internal macros for SMP support, do not use externally */ diff --git a/bsps/shared/irq/irq-generic.c b/bsps/shared/irq/irq-generic.c index abe732a9d3..65971fb1b3 100644 --- a/bsps/shared/irq/irq-generic.c +++ b/bsps/shared/irq/irq-generic.c @@ -44,7 +44,7 @@ #ifdef BSP_INTERRUPT_USE_INDEX_TABLE bsp_interrupt_handler_index_type bsp_interrupt_handler_index_table - [BSP_INTERRUPT_VECTOR_NUMBER]; + [BSP_INTERRUPT_VECTOR_COUNT]; #endif bsp_interrupt_handler_entry bsp_interrupt_handler_table -- cgit v1.2.3