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/aarch64/a53/include/bsp/irq.h | 1 - bsps/aarch64/a72/include/bsp/irq.h | 1 - bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h | 1 - 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 - bsps/i386/include/bsp/irq.h | 1 - bsps/include/bsp/irq-default.h | 5 ----- bsps/include/bsp/irq-generic.h | 22 ++++++++-------------- bsps/lm32/include/bsp/irq.h | 5 ----- bsps/m68k/genmcf548x/include/bsp/irq.h | 2 -- bsps/mips/csb350/include/bsp/irq.h | 1 - bsps/mips/hurricane/include/bsp/irq.h | 1 - bsps/mips/jmr3904/include/bsp/irq.h | 2 -- bsps/mips/malta/include/bsp/irq.h | 2 -- bsps/mips/rbtx4925/include/bsp/irq.h | 1 - bsps/mips/rbtx4938/include/bsp/irq.h | 1 - bsps/powerpc/gen5200/include/bsp/irq.h | 2 -- bsps/powerpc/gen83xx/include/bsp/irq.h | 2 -- bsps/powerpc/motorola_powerpc/include/bsp/irq.h | 1 - bsps/powerpc/mpc55xxevb/include/bsp/irq.h | 2 -- bsps/powerpc/mpc8260ads/include/bsp/irq.h | 2 -- bsps/powerpc/psim/include/bsp/irq.h | 1 - bsps/powerpc/qemuppc/include/bsp/irq.h | 2 -- bsps/powerpc/qoriq/include/bsp/irq.h | 2 -- bsps/powerpc/qoriq/irq/irq.c | 6 +++--- bsps/powerpc/t32mppc/include/bsp/irq.h | 1 - bsps/powerpc/tqm8xx/include/bsp/irq.h | 2 -- bsps/powerpc/virtex/include/bsp/irq.h | 1 - bsps/riscv/griscv/include/bsp/irq.h | 2 -- bsps/riscv/riscv/include/bsp/irq.h | 2 -- bsps/shared/irq/irq-info.c | 2 +- bsps/sparc/erc32/include/bsp/irq.h | 1 - bsps/sparc/leon2/include/bsp/irq.h | 1 - bsps/sparc/leon3/include/bsp/irq.h | 1 - bsps/x86_64/include/bsp/irq.h | 1 - testsuites/smptests/smpcapture02/init.c | 2 +- 61 files changed, 16 insertions(+), 107 deletions(-) diff --git a/bsps/aarch64/a53/include/bsp/irq.h b/bsps/aarch64/a53/include/bsp/irq.h index f7a4f1ad1f..e1aebf5a22 100644 --- a/bsps/aarch64/a53/include/bsp/irq.h +++ b/bsps/aarch64/a53/include/bsp/irq.h @@ -48,7 +48,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 1023 /* Interrupts vectors */ diff --git a/bsps/aarch64/a72/include/bsp/irq.h b/bsps/aarch64/a72/include/bsp/irq.h index c3de523d48..71076ed82a 100644 --- a/bsps/aarch64/a72/include/bsp/irq.h +++ b/bsps/aarch64/a72/include/bsp/irq.h @@ -48,7 +48,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 1023 /* Interrupts vectors */ diff --git a/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h b/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h index 13ce55d5b9..f12a4536b5 100644 --- a/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h +++ b/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h @@ -48,7 +48,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 1023 /* Interrupts vectors */ 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 /** @} */ diff --git a/bsps/i386/include/bsp/irq.h b/bsps/i386/include/bsp/irq.h index 50eacc97f0..6e2f7cbb2c 100644 --- a/bsps/i386/include/bsp/irq.h +++ b/bsps/i386/include/bsp/irq.h @@ -79,7 +79,6 @@ extern "C" { #define BSP_RT_TIMER3 10 #define BSP_SMP_IPI 16 /* not part of the ATPIC */ -#define BSP_INTERRUPT_VECTOR_MIN BSP_IRQ_VECTOR_LOWEST_OFFSET #define BSP_INTERRUPT_VECTOR_MAX BSP_IRQ_VECTOR_MAX_OFFSET /** @brief diff --git a/bsps/include/bsp/irq-default.h b/bsps/include/bsp/irq-default.h index 4d7beb189b..c72782e993 100644 --- a/bsps/include/bsp/irq-default.h +++ b/bsps/include/bsp/irq-default.h @@ -44,11 +44,6 @@ extern "C" { * @{ */ -/** - * @brief Default minimum interrupt vector. - */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - /** * @brief Default maximum interrupt vector. */ diff --git a/bsps/include/bsp/irq-generic.h b/bsps/include/bsp/irq-generic.h index 8dc6c6d576..a423f19192 100644 --- a/bsps/include/bsp/irq-generic.h +++ b/bsps/include/bsp/irq-generic.h @@ -58,20 +58,15 @@ extern "C" { #endif /* __cplusplus */ -#if !defined(BSP_INTERRUPT_VECTOR_MIN) || !defined(BSP_INTERRUPT_VECTOR_MAX) || (BSP_INTERRUPT_VECTOR_MAX + 1) < BSP_INTERRUPT_VECTOR_MIN - #error "invalid BSP_INTERRUPT_VECTOR_MIN or BSP_INTERRUPT_VECTOR_MAX" -#endif - -#if BSP_INTERRUPT_VECTOR_MIN != 0 - #error "BSP_INTERRUPT_VECTOR_MIN shall be zero" +#if !defined(BSP_INTERRUPT_VECTOR_MAX) + #error "BSP_INTERRUPT_VECTOR_MAX shall be defined" #endif #if defined(BSP_INTERRUPT_USE_INDEX_TABLE) && !defined(BSP_INTERRUPT_HANDLER_TABLE_SIZE) #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 - BSP_INTERRUPT_VECTOR_MIN + 1) +#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 @@ -117,9 +112,9 @@ static inline rtems_vector_number bsp_interrupt_handler_index( ) { #ifdef BSP_INTERRUPT_USE_INDEX_TABLE - return bsp_interrupt_handler_index_table [vector - BSP_INTERRUPT_VECTOR_MIN]; + return bsp_interrupt_handler_index_table [vector]; #else - return vector - BSP_INTERRUPT_VECTOR_MIN; + return vector; #endif } @@ -131,7 +126,7 @@ static inline rtems_vector_number bsp_interrupt_handler_index( * @brief Generic BSP Interrupt Support * * The BSP interrupt support manages a sequence of interrupt vector numbers - * ranging from @ref BSP_INTERRUPT_VECTOR_MIN to @ref BSP_INTERRUPT_VECTOR_MAX + * ranging from zero to @ref BSP_INTERRUPT_VECTOR_MAX * including the end points. It provides methods to * @ref bsp_interrupt_handler_install() "install", * @ref bsp_interrupt_handler_remove() "remove" and @@ -143,7 +138,7 @@ static inline rtems_vector_number bsp_interrupt_handler_index( * * You have to configure the BSP interrupt support in the file * for each BSP. For a minimum configuration you have to provide - * @ref BSP_INTERRUPT_VECTOR_MIN and @ref BSP_INTERRUPT_VECTOR_MAX. + * @ref BSP_INTERRUPT_VECTOR_MAX. * * For boards with small memory requirements you can define * @ref BSP_INTERRUPT_USE_INDEX_TABLE. With an enabled index table the handler @@ -178,8 +173,7 @@ static inline rtems_vector_number bsp_interrupt_handler_index( */ static inline bool bsp_interrupt_is_valid_vector(rtems_vector_number vector) { - return (rtems_vector_number) BSP_INTERRUPT_VECTOR_MIN <= vector - && vector <= (rtems_vector_number) BSP_INTERRUPT_VECTOR_MAX; + return vector <= (rtems_vector_number) BSP_INTERRUPT_VECTOR_MAX; } #endif diff --git a/bsps/lm32/include/bsp/irq.h b/bsps/lm32/include/bsp/irq.h index b1ccd66339..19ba56e161 100644 --- a/bsps/lm32/include/bsp/irq.h +++ b/bsps/lm32/include/bsp/irq.h @@ -32,11 +32,6 @@ * @{ */ -/** - * @brief Minimum vector number. - */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - /** * @brief Maximum vector number. */ diff --git a/bsps/m68k/genmcf548x/include/bsp/irq.h b/bsps/m68k/genmcf548x/include/bsp/irq.h index d1e9bf21c1..6fd7da96cd 100644 --- a/bsps/m68k/genmcf548x/include/bsp/irq.h +++ b/bsps/m68k/genmcf548x/include/bsp/irq.h @@ -89,8 +89,6 @@ #define MCF548X_IRQ_GPT1 61 #define MCF548X_IRQ_GPT0 62 -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX 63 #define BSP_INTERRUPT_CUSTOM_VALID_VECTOR diff --git a/bsps/mips/csb350/include/bsp/irq.h b/bsps/mips/csb350/include/bsp/irq.h index 4f006fdd5f..b1d3f86aa7 100644 --- a/bsps/mips/csb350/include/bsp/irq.h +++ b/bsps/mips/csb350/include/bsp/irq.h @@ -36,7 +36,6 @@ * */ /* MIPS_INTERRUPT_BASE should be 32 (0x20) */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define AU1X00_IRQ_SW0 (MIPS_INTERRUPT_BASE + 0) #define AU1X00_IRQ_SW1 (MIPS_INTERRUPT_BASE + 1) #define AU1X00_IRQ_IC0_REQ0 (MIPS_INTERRUPT_BASE + 2) diff --git a/bsps/mips/hurricane/include/bsp/irq.h b/bsps/mips/hurricane/include/bsp/irq.h index 3347ecb2a6..4264a0e84d 100644 --- a/bsps/mips/hurricane/include/bsp/irq.h +++ b/bsps/mips/hurricane/include/bsp/irq.h @@ -31,7 +31,6 @@ * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define RM5231_MAXIMUM_VECTORS (MIPS_INTERRUPT_BASE+8) #define BSP_INTERRUPT_VECTOR_MAX RM5231_MAXIMUM_VECTORS diff --git a/bsps/mips/jmr3904/include/bsp/irq.h b/bsps/mips/jmr3904/include/bsp/irq.h index cdb50e244e..a40f26dc7a 100644 --- a/bsps/mips/jmr3904/include/bsp/irq.h +++ b/bsps/mips/jmr3904/include/bsp/irq.h @@ -31,8 +31,6 @@ * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - /* * Interrupt Vector Numbers * diff --git a/bsps/mips/malta/include/bsp/irq.h b/bsps/mips/malta/include/bsp/irq.h index 3ca6f964a9..25cb186873 100644 --- a/bsps/mips/malta/include/bsp/irq.h +++ b/bsps/mips/malta/include/bsp/irq.h @@ -31,8 +31,6 @@ * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - /* * Interrupt Vector Numbers * diff --git a/bsps/mips/rbtx4925/include/bsp/irq.h b/bsps/mips/rbtx4925/include/bsp/irq.h index d3987b2d39..db28e65989 100644 --- a/bsps/mips/rbtx4925/include/bsp/irq.h +++ b/bsps/mips/rbtx4925/include/bsp/irq.h @@ -35,7 +35,6 @@ * Interrupt Vector Numbers * */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define TX4925_IRQ_RSV1 MIPS_INTERRUPT_BASE+0 #define TX4925_IRQ_WTE MIPS_INTERRUPT_BASE+1 #define TX4925_IRQ_INT0 MIPS_INTERRUPT_BASE+2 diff --git a/bsps/mips/rbtx4938/include/bsp/irq.h b/bsps/mips/rbtx4938/include/bsp/irq.h index bb18dcf86d..03ecacda73 100644 --- a/bsps/mips/rbtx4938/include/bsp/irq.h +++ b/bsps/mips/rbtx4938/include/bsp/irq.h @@ -35,7 +35,6 @@ * Interrupt Vector Numbers * */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define TX4938_IRQ_ECC MIPS_INTERRUPT_BASE+0 #define TX4938_IRQ_WTE MIPS_INTERRUPT_BASE+1 #define TX4938_IRQ_INT0 MIPS_INTERRUPT_BASE+2 diff --git a/bsps/powerpc/gen5200/include/bsp/irq.h b/bsps/powerpc/gen5200/include/bsp/irq.h index 5a0b3bd29e..63d39cb3df 100644 --- a/bsps/powerpc/gen5200/include/bsp/irq.h +++ b/bsps/powerpc/gen5200/include/bsp/irq.h @@ -203,8 +203,6 @@ typedef enum { #define BSP_CRIT_IRQ_PRIO_LEVELS 4 #define BSP_PERIODIC_TIMER BSP_SIU_IRQ_TMR6 -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET #endif diff --git a/bsps/powerpc/gen83xx/include/bsp/irq.h b/bsps/powerpc/gen83xx/include/bsp/irq.h index dc084ed2a2..42bd2980fe 100644 --- a/bsps/powerpc/gen83xx/include/bsp/irq.h +++ b/bsps/powerpc/gen83xx/include/bsp/irq.h @@ -162,8 +162,6 @@ extern "C" { BSP_IPIC_IRQ_LAST = BSP_IPIC_IRQ_MAX_OFFSET, } rtems_irq_symbolic_name; -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET rtems_status_code mpc83xx_ipic_set_mask( rtems_vector_number vector, rtems_vector_number mask_vector, bool mask); diff --git a/bsps/powerpc/motorola_powerpc/include/bsp/irq.h b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h index cbb6ff69cf..3fcdf916c2 100644 --- a/bsps/powerpc/motorola_powerpc/include/bsp/irq.h +++ b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h @@ -115,7 +115,6 @@ extern "C" { #define BSP_IRQ_NUMBER (BSP_MISC_IRQ_MAX_OFFSET + 1) #define BSP_LOWEST_OFFSET (BSP_ISA_IRQ_LOWEST_OFFSET) #define BSP_MAX_OFFSET (BSP_MISC_IRQ_MAX_OFFSET) -#define BSP_INTERRUPT_VECTOR_MIN (BSP_LOWEST_OFFSET) #define BSP_INTERRUPT_VECTOR_MAX (BSP_MAX_OFFSET) /* * Some ISA IRQ symbolic name definition diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/irq.h b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h index 491c120ee8..e0b3c3eaf8 100644 --- a/bsps/powerpc/mpc55xxevb/include/bsp/irq.h +++ b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h @@ -477,8 +477,6 @@ rtems_status_code mpc55xx_intc_clear_software_irq(rtems_vector_number vector); * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN MPC55XX_IRQ_MIN - #define BSP_INTERRUPT_VECTOR_MAX MPC55XX_IRQ_MAX #ifdef BSP_INTERRUPT_HANDLER_TABLE_SIZE diff --git a/bsps/powerpc/mpc8260ads/include/bsp/irq.h b/bsps/powerpc/mpc8260ads/include/bsp/irq.h index 1dd18611fc..12890d998e 100644 --- a/bsps/powerpc/mpc8260ads/include/bsp/irq.h +++ b/bsps/powerpc/mpc8260ads/include/bsp/irq.h @@ -141,8 +141,6 @@ extern volatile unsigned int ppc_cached_irq_mask; #define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET) #define BSP_PERIODIC_TIMER (BSP_DECREMENTER) -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET #define CPM_INTERRUPT diff --git a/bsps/powerpc/psim/include/bsp/irq.h b/bsps/powerpc/psim/include/bsp/irq.h index 376c95a627..248cfb5579 100644 --- a/bsps/powerpc/psim/include/bsp/irq.h +++ b/bsps/powerpc/psim/include/bsp/irq.h @@ -57,7 +57,6 @@ #include -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET #ifdef __cplusplus diff --git a/bsps/powerpc/qemuppc/include/bsp/irq.h b/bsps/powerpc/qemuppc/include/bsp/irq.h index 7124dbcaf8..1fd8b53a11 100644 --- a/bsps/powerpc/qemuppc/include/bsp/irq.h +++ b/bsps/powerpc/qemuppc/include/bsp/irq.h @@ -56,8 +56,6 @@ */ #define BSP_DECREMENTER (BSP_PROCESSOR_IRQ_LOWEST_OFFSET) -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET /* #include */ diff --git a/bsps/powerpc/qoriq/include/bsp/irq.h b/bsps/powerpc/qoriq/include/bsp/irq.h index 13589051d5..09a4279399 100644 --- a/bsps/powerpc/qoriq/include/bsp/irq.h +++ b/bsps/powerpc/qoriq/include/bsp/irq.h @@ -366,8 +366,6 @@ extern "C" { * @{ */ -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define QORIQ_PIC_PRIORITY_LOWEST 1 #define QORIQ_PIC_PRIORITY_HIGHEST 15 #define QORIQ_PIC_PRIORITY_DISABLED 0 diff --git a/bsps/powerpc/qoriq/irq/irq.c b/bsps/powerpc/qoriq/irq/irq.c index 0fa69934dd..7f9680ea1c 100644 --- a/bsps/powerpc/qoriq/irq/irq.c +++ b/bsps/powerpc/qoriq/irq/irq.c @@ -128,7 +128,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) { unsigned int i; - for (i = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { uint32_t config; unsigned int priority; uint32_t destination; @@ -354,7 +354,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) pic_reset(); - for (i = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { volatile qoriq_pic_src_cfg *src_cfg = get_src_cfg(i); src_cfg->vpr = VPR_MSK | VPR_P @@ -375,7 +375,7 @@ rtems_status_code bsp_interrupt_facility_initialize(void) qoriq.pic.ctpr = 0; - for (i = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { + for (i = 0; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) { qoriq.pic.iack; qoriq.pic.eoi = 0; qoriq.pic.whoami; diff --git a/bsps/powerpc/t32mppc/include/bsp/irq.h b/bsps/powerpc/t32mppc/include/bsp/irq.h index 0053aa5ac1..7ac3b1f676 100644 --- a/bsps/powerpc/t32mppc/include/bsp/irq.h +++ b/bsps/powerpc/t32mppc/include/bsp/irq.h @@ -24,7 +24,6 @@ extern "C" { #endif /* __cplusplus */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX 0 RTEMS_INLINE_ROUTINE void bsp_interrupt_set_affinity( diff --git a/bsps/powerpc/tqm8xx/include/bsp/irq.h b/bsps/powerpc/tqm8xx/include/bsp/irq.h index 2d66829037..3a5010d602 100644 --- a/bsps/powerpc/tqm8xx/include/bsp/irq.h +++ b/bsps/powerpc/tqm8xx/include/bsp/irq.h @@ -146,8 +146,6 @@ extern "C" { #define BSP_PERIODIC_TIMER BSP_SIU_INT_IRQ_6 #define BSP_FAST_ETHERNET_CTRL BSP_SIU_INT_IRQ_3 -#define BSP_INTERRUPT_VECTOR_MIN BSP_LOWEST_OFFSET - #define BSP_INTERRUPT_VECTOR_MAX BSP_MAX_OFFSET extern int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine); diff --git a/bsps/powerpc/virtex/include/bsp/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h index 1ce5b68b98..02fe972404 100644 --- a/bsps/powerpc/virtex/include/bsp/irq.h +++ b/bsps/powerpc/virtex/include/bsp/irq.h @@ -61,7 +61,6 @@ (BSP_IS_PROCESSOR_IRQ(irqnum) \ || BSP_IS_OPBINTC_IRQ(irqnum)) -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX BSP_PROCESSOR_IRQ_MAX_OFFSET #ifndef ASM diff --git a/bsps/riscv/griscv/include/bsp/irq.h b/bsps/riscv/griscv/include/bsp/irq.h index cd6f1599ad..2100e6f7d3 100644 --- a/bsps/riscv/griscv/include/bsp/irq.h +++ b/bsps/riscv/griscv/include/bsp/irq.h @@ -54,8 +54,6 @@ #define RISCV_INTERRUPT_VECTOR_EXTERNAL_TO_INDEX(x) ((x) - 2) -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX RISCV_INTERRUPT_VECTOR_EXTERNAL(RISCV_MAXIMUM_EXTERNAL_INTERRUPTS - 1) void bsp_interrupt_set_affinity( diff --git a/bsps/riscv/riscv/include/bsp/irq.h b/bsps/riscv/riscv/include/bsp/irq.h index cf88443740..a902570155 100644 --- a/bsps/riscv/riscv/include/bsp/irq.h +++ b/bsps/riscv/riscv/include/bsp/irq.h @@ -54,8 +54,6 @@ #define RISCV_INTERRUPT_VECTOR_EXTERNAL_TO_INDEX(x) ((x) - 2) -#define BSP_INTERRUPT_VECTOR_MIN 0 - #define BSP_INTERRUPT_VECTOR_MAX RISCV_INTERRUPT_VECTOR_EXTERNAL(RISCV_MAXIMUM_EXTERNAL_INTERRUPTS - 1) void bsp_interrupt_set_affinity( diff --git a/bsps/shared/irq/irq-info.c b/bsps/shared/irq/irq-info.c index b1df3b2915..697976e525 100644 --- a/bsps/shared/irq/irq-info.c +++ b/bsps/shared/irq/irq-info.c @@ -87,7 +87,7 @@ void bsp_interrupt_report_with_plugin( "--------+----------------------------------+---------+------------+------------\n" ); - for (v = BSP_INTERRUPT_VECTOR_MIN; v <= BSP_INTERRUPT_VECTOR_MAX; ++v) { + for (v = 0; v <= BSP_INTERRUPT_VECTOR_MAX; ++v) { e.vector = v; rtems_interrupt_handler_iterate( v, diff --git a/bsps/sparc/erc32/include/bsp/irq.h b/bsps/sparc/erc32/include/bsp/irq.h index 7789c9f57d..ad3a65fcc1 100644 --- a/bsps/sparc/erc32/include/bsp/irq.h +++ b/bsps/sparc/erc32/include/bsp/irq.h @@ -21,7 +21,6 @@ #include #define BSP_INTERRUPT_VECTOR_MAX_STD 15 /* Standard IRQ controller */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX BSP_INTERRUPT_VECTOR_MAX_STD /* No extra check is needed */ diff --git a/bsps/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h index 169f3cb598..287530e275 100644 --- a/bsps/sparc/leon2/include/bsp/irq.h +++ b/bsps/sparc/leon2/include/bsp/irq.h @@ -19,7 +19,6 @@ #define LIBBSP_LEON2_IRQ_CONFIG_H #define BSP_INTERRUPT_VECTOR_MAX_STD 15 /* Standard IRQ controller */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX BSP_INTERRUPT_VECTOR_MAX_STD /* No extra check is needed */ diff --git a/bsps/sparc/leon3/include/bsp/irq.h b/bsps/sparc/leon3/include/bsp/irq.h index 1c8e1e4516..77f9fc2528 100644 --- a/bsps/sparc/leon3/include/bsp/irq.h +++ b/bsps/sparc/leon3/include/bsp/irq.h @@ -24,7 +24,6 @@ #define BSP_INTERRUPT_VECTOR_MAX_STD 15 /* Standard IRQ controller */ #define BSP_INTERRUPT_VECTOR_MAX_EXT 31 /* Extended IRQ controller */ -#define BSP_INTERRUPT_VECTOR_MIN 0 #define BSP_INTERRUPT_VECTOR_MAX BSP_INTERRUPT_VECTOR_MAX_EXT /* The check is different depending on IRQ controller, runtime detected */ diff --git a/bsps/x86_64/include/bsp/irq.h b/bsps/x86_64/include/bsp/irq.h index f8be997e8f..312c831962 100644 --- a/bsps/x86_64/include/bsp/irq.h +++ b/bsps/x86_64/include/bsp/irq.h @@ -38,7 +38,6 @@ #include #include -#define BSP_INTERRUPT_VECTOR_MIN 0x0 #define BSP_IRQ_VECTOR_NUMBER 34 #define BSP_INTERRUPT_VECTOR_MAX BSP_IRQ_VECTOR_NUMBER diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c index fa801218e6..9cf1f0b006 100644 --- a/testsuites/smptests/smpcapture02/init.c +++ b/testsuites/smptests/smpcapture02/init.c @@ -316,7 +316,7 @@ static void Init(rtems_task_argument arg) test(cpu_count); /* Try to find the clock interrupt handler */ - for ( vec=BSP_INTERRUPT_VECTOR_MIN; vec