From af73b7b64b385232eddfd899ebd9e93054b66026 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 18 Jun 2021 07:37:18 +0200 Subject: bsps/irq: Remove BSP_INTERRUPT_VECTOR_MIN Remove BSP_INTERRUPT_VECTOR_MIN and unconditionally let interrupt vector numbers start with zero. The BSP_INTERRUPT_VECTOR_MIN == 0 invariant was tested by the previous commit and building all BSPs. Update #3269. --- bsps/arm/altera-cyclone-v/include/bsp/irq.h | 1 - bsps/arm/atsam/include/bsp/irq.h | 2 -- bsps/arm/beagle/include/bsp/irq.h | 1 - bsps/arm/beagle/irq/irq.c | 2 +- bsps/arm/csb336/include/bsp/irq.h | 2 -- bsps/arm/csb337/include/bsp/irq.h | 2 -- bsps/arm/edb7312/include/bsp/irq.h | 2 -- bsps/arm/fvp/include/bsp/irq.h | 2 -- bsps/arm/gumstix/include/bsp/irq.h | 2 -- bsps/arm/imx/include/bsp/irq.h | 1 - bsps/arm/imxrt/include/bsp/irq.h | 1 - bsps/arm/lm3s69xx/include/bsp/irq.h | 1 - bsps/arm/lpc176x/include/bsp/irq.h | 2 -- bsps/arm/lpc24xx/include/bsp/irq.h | 2 -- bsps/arm/lpc24xx/irq/irq.c | 2 +- bsps/arm/lpc32xx/include/bsp/irq.h | 1 - bsps/arm/raspberrypi/include/bsp/irq.h | 1 - bsps/arm/realview-pbx-a9/include/bsp/irq.h | 1 - bsps/arm/rtl22xx/include/bsp/irq.h | 2 -- bsps/arm/shared/irq/irq-armv7m.c | 2 +- bsps/arm/smdk2410/include/bsp/irq.h | 2 -- bsps/arm/stm32f4/include/bsp/irq.h | 1 - bsps/arm/stm32h7/include/bsp/irq.h | 2 -- bsps/arm/tms570/include/bsp/irq.h | 1 - bsps/arm/xen/include/bsp/irq.h | 1 - bsps/arm/xilinx-zynq/include/bsp/irq.h | 1 - bsps/arm/xilinx-zynqmp/include/bsp/irq.h | 1 - 27 files changed, 3 insertions(+), 38 deletions(-) (limited to 'bsps/arm') diff --git a/bsps/arm/altera-cyclone-v/include/bsp/irq.h b/bsps/arm/altera-cyclone-v/include/bsp/irq.h index bd2bba4caa..d5470f9b4e 100644 --- a/bsps/arm/altera-cyclone-v/include/bsp/irq.h +++ b/bsps/arm/altera-cyclone-v/include/bsp/irq.h @@ -47,7 +47,6 @@ extern "C" { */ /* Use interrupt IDs as defined in alt_interrupt_common.h */ -#define BSP_INTERRUPT_VECTOR_MIN ALT_INT_INTERRUPT_SGI0 #define BSP_INTERRUPT_VECTOR_MAX ALT_INT_INTERRUPT_RAM_ECC_UNCORRECTED_IRQ /** @} */ diff --git a/bsps/arm/atsam/include/bsp/irq.h b/bsps/arm/atsam/include/bsp/irq.h index 19370e4852..b6eac75042 100644 --- a/bsps/arm/atsam/include/bsp/irq.h +++ b/bsps/arm/atsam/include/bsp/irq.h @@ -23,8 +23,6 @@ #include #endif -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX 64 #endif /* LIBBSP_ARM_ATSAM_ESV_70_IRQ_H */ diff --git a/bsps/arm/beagle/include/bsp/irq.h b/bsps/arm/beagle/include/bsp/irq.h index 4cbf3a271f..9ecd6bc31e 100644 --- a/bsps/arm/beagle/include/bsp/irq.h +++ b/bsps/arm/beagle/include/bsp/irq.h @@ -15,7 +15,6 @@ #include #include -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 127 #endif /* ASM */ diff --git a/bsps/arm/beagle/irq/irq.c b/bsps/arm/beagle/irq/irq.c index 2fa1a5b0f0..721703b87b 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 = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; i++) + for(i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; i++) bsp_interrupt_vector_disable(i); /* Install generic interrupt handler */ diff --git a/bsps/arm/csb336/include/bsp/irq.h b/bsps/arm/csb336/include/bsp/irq.h index eb56fdd887..b9978242eb 100644 --- a/bsps/arm/csb336/include/bsp/irq.h +++ b/bsps/arm/csb336/include/bsp/irq.h @@ -88,8 +88,6 @@ #define BSP_INT_WDT 63 #define BSP_MAX_INT 64 -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (BSP_MAX_INT - 1) #endif /* __IRQ_H__ */ diff --git a/bsps/arm/csb337/include/bsp/irq.h b/bsps/arm/csb337/include/bsp/irq.h index ffc022fa4f..7d967b0ae0 100644 --- a/bsps/arm/csb337/include/bsp/irq.h +++ b/bsps/arm/csb337/include/bsp/irq.h @@ -72,8 +72,6 @@ #define AT91RM9200_INT_IRQ6 31 #define AT91RM9200_MAX_INT 32 -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (AT91RM9200_MAX_INT - 1) #endif /* __IRQ_H__ */ diff --git a/bsps/arm/edb7312/include/bsp/irq.h b/bsps/arm/edb7312/include/bsp/irq.h index e834e9cf5c..ba167083d3 100644 --- a/bsps/arm/edb7312/include/bsp/irq.h +++ b/bsps/arm/edb7312/include/bsp/irq.h @@ -83,8 +83,6 @@ /** @} */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (BSP_MAX_INT - 1) /** @} */ diff --git a/bsps/arm/fvp/include/bsp/irq.h b/bsps/arm/fvp/include/bsp/irq.h index 7b4450ffec..d28f7a6db3 100644 --- a/bsps/arm/fvp/include/bsp/irq.h +++ b/bsps/arm/fvp/include/bsp/irq.h @@ -40,8 +40,6 @@ #include -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (32 + BSP_ARM_SHARED_PERIPHERAL_INTERRUPT_COUNT) #endif /* LIBBSP_ARM_FVP_IRQ_H */ diff --git a/bsps/arm/gumstix/include/bsp/irq.h b/bsps/arm/gumstix/include/bsp/irq.h index a8b5d24da1..f7d0ca72d5 100644 --- a/bsps/arm/gumstix/include/bsp/irq.h +++ b/bsps/arm/gumstix/include/bsp/irq.h @@ -20,8 +20,6 @@ #include -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (PRIMARY_IRQS - 1) #endif /* __asm__ */ diff --git a/bsps/arm/imx/include/bsp/irq.h b/bsps/arm/imx/include/bsp/irq.h index 1eea075bdc..249b416387 100644 --- a/bsps/arm/imx/include/bsp/irq.h +++ b/bsps/arm/imx/include/bsp/irq.h @@ -26,7 +26,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 159 #define BSP_INTERRUPT_VECTOR_INVALID (UINT32_MAX) diff --git a/bsps/arm/imxrt/include/bsp/irq.h b/bsps/arm/imxrt/include/bsp/irq.h index eed54f8648..5e7fba0d33 100644 --- a/bsps/arm/imxrt/include/bsp/irq.h +++ b/bsps/arm/imxrt/include/bsp/irq.h @@ -43,7 +43,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 159 #define BSP_INTERRUPT_VECTOR_INVALID (UINT32_MAX) diff --git a/bsps/arm/lm3s69xx/include/bsp/irq.h b/bsps/arm/lm3s69xx/include/bsp/irq.h index ca7a462f7f..25df016b16 100644 --- a/bsps/arm/lm3s69xx/include/bsp/irq.h +++ b/bsps/arm/lm3s69xx/include/bsp/irq.h @@ -100,7 +100,6 @@ #define LM3S69XX_IRQ_PRIORITY_HIGHEST LM3S69XX_IRQ_PRIORITY_VALUE_MIN #define LM3S69XX_IRQ_PRIORITY_LOWEST LM3S69XX_IRQ_PRIORITY_VALUE_MAX -#define BSP_INTERRUPT_VECTOR_MIN 0 /* NOTE: for lm3s6965 - 43 */ #define BSP_INTERRUPT_VECTOR_MAX 47 diff --git a/bsps/arm/lpc176x/include/bsp/irq.h b/bsps/arm/lpc176x/include/bsp/irq.h index 719608c8f7..4757e19a62 100644 --- a/bsps/arm/lpc176x/include/bsp/irq.h +++ b/bsps/arm/lpc176x/include/bsp/irq.h @@ -35,8 +35,6 @@ * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0U - #define LPC176X_IRQ_WDT 0U #define LPC176X_IRQ_TIMER_0 1U #define LPC176X_IRQ_TIMER_1 2U diff --git a/bsps/arm/lpc24xx/include/bsp/irq.h b/bsps/arm/lpc24xx/include/bsp/irq.h index 0f0e473a0c..7bbbf44f49 100644 --- a/bsps/arm/lpc24xx/include/bsp/irq.h +++ b/bsps/arm/lpc24xx/include/bsp/irq.h @@ -35,8 +35,6 @@ * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - #ifdef ARM_MULTILIB_ARCH_V4 #define LPC24XX_IRQ_WDT 0 #define LPC24XX_IRQ_SOFTWARE 1 diff --git a/bsps/arm/lpc24xx/irq/irq.c b/bsps/arm/lpc24xx/irq/irq.c index 7801c37843..2fed80efda 100644 --- a/bsps/arm/lpc24xx/irq/irq.c +++ b/bsps/arm/lpc24xx/irq/irq.c @@ -91,7 +91,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Use IRQ category */ VICIntSelect = 0; - for (i = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++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 1eef140faf..1b1ff8db78 100644 --- a/bsps/arm/lpc32xx/include/bsp/irq.h +++ b/bsps/arm/lpc32xx/include/bsp/irq.h @@ -139,7 +139,6 @@ extern "C" { #define LPC32XX_IRQ_PRIORITY_HIGHEST LPC32XX_IRQ_PRIORITY_VALUE_MIN #define LPC32XX_IRQ_PRIORITY_LOWEST LPC32XX_IRQ_PRIORITY_VALUE_MAX -#define BSP_INTERRUPT_VECTOR_MIN LPC32XX_IRQ_SIC_1_IRQ #define BSP_INTERRUPT_VECTOR_MAX LPC32XX_IRQ_SYSCLK #define LPC32XX_IRQ_COUNT (BSP_INTERRUPT_VECTOR_MAX + 1) diff --git a/bsps/arm/raspberrypi/include/bsp/irq.h b/bsps/arm/raspberrypi/include/bsp/irq.h index 17e4472b34..87b6da2963 100644 --- a/bsps/arm/raspberrypi/include/bsp/irq.h +++ b/bsps/arm/raspberrypi/include/bsp/irq.h @@ -69,7 +69,6 @@ #define BCM2835_IRQ_ID_ILL_ACCESS_1 70 #define BCM2835_IRQ_ID_ILL_ACCESS_0 71 -#define BSP_INTERRUPT_VECTOR_MIN (0) #define BSP_INTERRUPT_VECTOR_MAX (BCM2835_INTC_TOTAL_IRQ - 1) #define BSP_INTERRUPT_VECTOR_INVALID (UINT32_MAX) diff --git a/bsps/arm/realview-pbx-a9/include/bsp/irq.h b/bsps/arm/realview-pbx-a9/include/bsp/irq.h index 270ecd33ae..1d7a6b68c8 100644 --- a/bsps/arm/realview-pbx-a9/include/bsp/irq.h +++ b/bsps/arm/realview-pbx-a9/include/bsp/irq.h @@ -90,7 +90,6 @@ extern "C" { #define RVPBXA9_IRQ_P_NINT_6 88 #define RVPBXA9_IRQ_P_NINT_7 89 -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 89 #ifdef __cplusplus diff --git a/bsps/arm/rtl22xx/include/bsp/irq.h b/bsps/arm/rtl22xx/include/bsp/irq.h index 31825ca56e..ee7f603cf9 100644 --- a/bsps/arm/rtl22xx/include/bsp/irq.h +++ b/bsps/arm/rtl22xx/include/bsp/irq.h @@ -53,8 +53,6 @@ #define LPC22xx_INTERRUPT_CAN4RX 27 /* CAN2 Rx interrupt */ #define BSP_MAX_INT 28 -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (BSP_MAX_INT - 1) #define UNDEFINED_INSTRUCTION_VECTOR_ADDR (*(u_long *)0x00000004L) diff --git a/bsps/arm/shared/irq/irq-armv7m.c b/bsps/arm/shared/irq/irq-armv7m.c index 84ebeeb159..7c7c1ab114 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 = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++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/smdk2410/include/bsp/irq.h b/bsps/arm/smdk2410/include/bsp/irq.h index 3f3fe92aea..ca846920ff 100644 --- a/bsps/arm/smdk2410/include/bsp/irq.h +++ b/bsps/arm/smdk2410/include/bsp/irq.h @@ -90,8 +90,6 @@ #error "Undefined Samsung CPU model" #endif -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX (BSP_MAX_INT - 1) #endif /* _IRQ_H_ */ diff --git a/bsps/arm/stm32f4/include/bsp/irq.h b/bsps/arm/stm32f4/include/bsp/irq.h index 1035a43519..3c047d3da7 100644 --- a/bsps/arm/stm32f4/include/bsp/irq.h +++ b/bsps/arm/stm32f4/include/bsp/irq.h @@ -133,7 +133,6 @@ extern "C" { #define STM32F4_IRQ_PRIORITY_HIGHEST STM32F4_IRQ_PRIORITY_VALUE_MIN #define STM32F4_IRQ_PRIORITY_LOWEST STM32F4_IRQ_PRIORITY_VALUE_MAX -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 81 /** @} */ diff --git a/bsps/arm/stm32h7/include/bsp/irq.h b/bsps/arm/stm32h7/include/bsp/irq.h index b3ff7a9621..609c1a2ac2 100644 --- a/bsps/arm/stm32h7/include/bsp/irq.h +++ b/bsps/arm/stm32h7/include/bsp/irq.h @@ -36,8 +36,6 @@ #endif /* ASM */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX 239 #endif /* LIBBSP_ARM_STM32H7_IRQ_H */ diff --git a/bsps/arm/tms570/include/bsp/irq.h b/bsps/arm/tms570/include/bsp/irq.h index c37ebadbc4..2f412604bb 100644 --- a/bsps/arm/tms570/include/bsp/irq.h +++ b/bsps/arm/tms570/include/bsp/irq.h @@ -32,7 +32,6 @@ #include #endif -#define BSP_INTERRUPT_VECTOR_MIN 0U #define TMS570_IRQ_ESM_HIGH 0 #define TMS570_IRQ_RESERVED 1 #define TMS570_IRQ_TIMER_0 2 diff --git a/bsps/arm/xen/include/bsp/irq.h b/bsps/arm/xen/include/bsp/irq.h index a147a1c079..a29917d31b 100644 --- a/bsps/arm/xen/include/bsp/irq.h +++ b/bsps/arm/xen/include/bsp/irq.h @@ -40,7 +40,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 1023 /* Xen guest interrupts */ diff --git a/bsps/arm/xilinx-zynq/include/bsp/irq.h b/bsps/arm/xilinx-zynq/include/bsp/irq.h index e707337fa1..099edcd034 100644 --- a/bsps/arm/xilinx-zynq/include/bsp/irq.h +++ b/bsps/arm/xilinx-zynq/include/bsp/irq.h @@ -114,7 +114,6 @@ extern "C" { #define ZYNQ_IRQ_FPGA_15 91 #define ZYNQ_IRQ_PARITY 92 -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 92 /** @} */ diff --git a/bsps/arm/xilinx-zynqmp/include/bsp/irq.h b/bsps/arm/xilinx-zynqmp/include/bsp/irq.h index 6496d2312e..7ad1a01d90 100644 --- a/bsps/arm/xilinx-zynqmp/include/bsp/irq.h +++ b/bsps/arm/xilinx-zynqmp/include/bsp/irq.h @@ -67,7 +67,6 @@ extern "C" { #define ZYNQMP_IRQ_UART_0 53 #define ZYNQMP_IRQ_UART_1 54 -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 187 /** @} */ -- cgit v1.2.3