From 3fee662093dabd5550d7093fe1d77080f74ab437 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 19 Jun 2021 12:51:58 +0200 Subject: bsps/irq: Use BSP_INTERRUPT_VECTOR_COUNT Use BSP_INTERRUPT_VECTOR_COUNT instead of BSP_INTERRUPT_VECTOR_MAX. Update #3269. --- bsps/arm/atsam/start/bspstart.c | 2 +- bsps/arm/beagle/irq/irq.c | 2 +- bsps/arm/lpc176x/irq/irq.c | 2 +- bsps/arm/lpc24xx/irq/irq.c | 4 ++-- bsps/arm/lpc32xx/include/bsp/irq.h | 2 +- bsps/arm/shared/irq/irq-armv7m.c | 2 +- bsps/arm/shared/start/start.S | 2 +- bsps/arm/tms570/irq/irq.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'bsps/arm') diff --git a/bsps/arm/atsam/start/bspstart.c b/bsps/arm/atsam/start/bspstart.c index b463bab696..3f49779797 100644 --- a/bsps/arm/atsam/start/bspstart.c +++ b/bsps/arm/atsam/start/bspstart.c @@ -21,7 +21,7 @@ #include RTEMS_STATIC_ASSERT( - PERIPH_COUNT_IRQn <= BSP_INTERRUPT_VECTOR_MAX, + PERIPH_COUNT_IRQn <= BSP_INTERRUPT_VECTOR_COUNT, PERIPH_COUNT_IRQn ); diff --git a/bsps/arm/beagle/irq/irq.c b/bsps/arm/beagle/irq/irq.c index 721703b87b..8e9294cae9 100644 --- a/bsps/arm/beagle/irq/irq.c +++ b/bsps/arm/beagle/irq/irq.c @@ -133,7 +133,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) } /* Mask all interrupts */ - for(i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; i++) + for(i = 0; i < BSP_INTERRUPT_VECTOR_COUNT; i++) bsp_interrupt_vector_disable(i); /* Install generic interrupt handler */ diff --git a/bsps/arm/lpc176x/irq/irq.c b/bsps/arm/lpc176x/irq/irq.c index e05fd59e6c..a060401d0b 100644 --- a/bsps/arm/lpc176x/irq/irq.c +++ b/bsps/arm/lpc176x/irq/irq.c @@ -38,7 +38,7 @@ */ static inline bool lpc176x_irq_is_valid( const rtems_vector_number vector ) { - return vector <= BSP_INTERRUPT_VECTOR_MAX; + return vector < BSP_INTERRUPT_VECTOR_COUNT; } void lpc176x_irq_set_priority( diff --git a/bsps/arm/lpc24xx/irq/irq.c b/bsps/arm/lpc24xx/irq/irq.c index 2fed80efda..ed07805a9a 100644 --- a/bsps/arm/lpc24xx/irq/irq.c +++ b/bsps/arm/lpc24xx/irq/irq.c @@ -31,7 +31,7 @@ static inline bool lpc24xx_irq_is_valid(rtems_vector_number vector) { - return vector <= BSP_INTERRUPT_VECTOR_MAX; + return vector < BSP_INTERRUPT_VECTOR_COUNT; } void lpc24xx_irq_set_priority(rtems_vector_number vector, unsigned priority) @@ -91,7 +91,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Use IRQ category */ VICIntSelect = 0; - for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i < BSP_INTERRUPT_VECTOR_COUNT; ++i) { /* Use the vector address register to store the vector number */ addr [i] = i; diff --git a/bsps/arm/lpc32xx/include/bsp/irq.h b/bsps/arm/lpc32xx/include/bsp/irq.h index d6f7e3144e..02fce3258a 100644 --- a/bsps/arm/lpc32xx/include/bsp/irq.h +++ b/bsps/arm/lpc32xx/include/bsp/irq.h @@ -142,7 +142,7 @@ extern "C" { #define BSP_INTERRUPT_VECTOR_MAX LPC32XX_IRQ_SYSCLK #define BSP_INTERRUPT_VECTOR_COUNT (LPC32XX_IRQ_SYSCLK + 1) -#define LPC32XX_IRQ_COUNT (BSP_INTERRUPT_VECTOR_MAX + 1) +#define LPC32XX_IRQ_COUNT BSP_INTERRUPT_VECTOR_COUNT void lpc32xx_irq_set_priority(rtems_vector_number vector, unsigned priority); diff --git a/bsps/arm/shared/irq/irq-armv7m.c b/bsps/arm/shared/irq/irq-armv7m.c index 7c7c1ab114..2bf8c9df74 100644 --- a/bsps/arm/shared/irq/irq-armv7m.c +++ b/bsps/arm/shared/irq/irq-armv7m.c @@ -67,7 +67,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) _ARMV7M_SCB->icsr = ARMV7M_SCB_ICSR_PENDSVCLR | ARMV7M_SCB_ICSR_PENDSTCLR; - for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i < BSP_INTERRUPT_VECTOR_COUNT; ++i) { _ARMV7M_NVIC_Clear_enable(i); _ARMV7M_NVIC_Clear_pending(i); _ARMV7M_NVIC_Set_priority(i, BSP_ARMV7M_IRQ_PRIORITY_DEFAULT); diff --git a/bsps/arm/shared/start/start.S b/bsps/arm/shared/start/start.S index bd623178ed..698495d32e 100644 --- a/bsps/arm/shared/start/start.S +++ b/bsps/arm/shared/start/start.S @@ -529,7 +529,7 @@ bsp_start_vector_table_begin: .word _ARMV7M_Exception_default /* Reserved */ .word _ARMV7M_Pendable_service_call /* PendSV */ .word _ARMV7M_Clock_handler /* SysTick */ - .rept BSP_INTERRUPT_VECTOR_MAX + 1 + .rept BSP_INTERRUPT_VECTOR_COUNT .word _ARMV7M_NVIC_Interrupt_dispatch /* IRQ */ .endr diff --git a/bsps/arm/tms570/irq/irq.c b/bsps/arm/tms570/irq/irq.c index 7129915c93..4abab8feb3 100644 --- a/bsps/arm/tms570/irq/irq.c +++ b/bsps/arm/tms570/irq/irq.c @@ -28,7 +28,7 @@ #include #include -unsigned int priorityTable[BSP_INTERRUPT_VECTOR_MAX+1]; +unsigned int priorityTable[BSP_INTERRUPT_VECTOR_COUNT]; /** * @brief Set priority of the interrupt vector. -- cgit v1.2.3