This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fa7cb3c2e9462c80fdf291ed50f617050ed2b32c Author: buxiasen <[email protected]> AuthorDate: Sun Nov 30 20:09:30 2025 +0800 arm_m: merge arm/include/armv6/7/8-m/nvicpri.h into arm_m We should reduce the dup of code Signed-off-by: buxiasen <[email protected]> Signed-off-by: hujun5 <[email protected]> --- arch/arm/include/{armv7-m => arm_m}/nvicpri.h | 8 +-- arch/arm/include/armv7-m/irq.h | 2 +- arch/arm/include/armv8-m/irq.h | 2 +- arch/arm/include/armv8-m/nvicpri.h | 78 ---------------------- arch/arm/src/armv7-m/arm_exception.S | 2 +- arch/arm/src/armv7-m/arm_initialstate.c | 2 +- arch/arm/src/armv7-m/arm_schedulesigaction.c | 2 +- arch/arm/src/armv8-m/arm_exception.S | 2 +- arch/arm/src/armv8-m/arm_initialstate.c | 2 +- arch/arm/src/armv8-m/arm_schedulesigaction.c | 2 +- arch/arm/src/at32/at32_irq.c | 2 +- arch/arm/src/common/stm32/stm32_irq_m33_v1.c | 2 +- arch/arm/src/common/stm32/stm32_irq_m3m4_v1.c | 2 +- arch/arm/src/efm32/efm32_irq.c | 2 +- arch/arm/src/eoss3/eoss3_irq.c | 2 +- arch/arm/src/gd32f4/gd32f4xx_irq.c | 2 +- arch/arm/src/gd32w51x/gd32w51x_irq.c | 2 +- arch/arm/src/ht32f491x3/ht32f491x3_irq.c | 2 +- arch/arm/src/imx9/imx9_irq.c | 2 +- arch/arm/src/imxrt/imxrt_irq.c | 2 +- arch/arm/src/kinetis/kinetis_irq.c | 2 +- arch/arm/src/lc823450/lc823450_irq.c | 2 +- arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 2 +- arch/arm/src/lpc43xx/lpc43_irq.c | 2 +- arch/arm/src/lpc54xx/lpc54_irq.c | 2 +- arch/arm/src/max326xx/common/max326_irq.c | 2 +- arch/arm/src/mcx-nxxx/nxxx_irq.c | 2 +- arch/arm/src/mx8mp/mx8mp_irq.c | 2 +- arch/arm/src/n32h7/n32_irq.c | 2 +- arch/arm/src/nrf52/nrf52_irq.c | 2 +- arch/arm/src/nrf52/nrf52_sdc.c | 2 +- arch/arm/src/nrf53/nrf53_irq.c | 2 +- arch/arm/src/nrf53/nrf53_sdc.c | 2 +- arch/arm/src/nrf54l/nrf54l_irq.c | 2 +- arch/arm/src/nrf54l/nrf54l_sdc.c | 2 +- arch/arm/src/nrf91/nrf91_irq.c | 2 +- arch/arm/src/ra4/ra_irq.c | 2 +- arch/arm/src/ra8m1/ra_irq.c | 2 +- arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 2 +- arch/arm/src/s32k3xx/s32k3xx_irq.c | 2 +- arch/arm/src/sam34/sam_irq.c | 2 +- arch/arm/src/samd5e5/sam_irq.c | 2 +- arch/arm/src/samv7/sam_irq.c | 2 +- arch/arm/src/stm32f7/stm32_irq.c | 2 +- arch/arm/src/stm32h7/stm32_irq.c | 2 +- arch/arm/src/stm32l4/stm32l4_irq.c | 2 +- arch/arm/src/stm32n6/stm32_irq.c | 2 +- arch/arm/src/stm32wl5/stm32wl5_irq.c | 2 +- arch/arm/src/tiva/common/tiva_irq.c | 2 +- arch/arm/src/xmc4/xmc4_irq.c | 2 +- boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c | 2 +- .../stm32f1/viewtool-stm32f107/src/stm32_highpri.c | 2 +- .../arm/stm32f3/nucleo-f302r8/src/stm32_highpri.c | 2 +- .../arm/stm32f3/nucleo-f334r8/src/stm32_highpri.c | 2 +- .../arm/stm32f3/stm32f334-disco/src/stm32_smps.c | 2 +- .../stm32f4/stm32f429i-disco/src/stm32_highpri.c | 2 +- boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c | 2 +- 57 files changed, 59 insertions(+), 137 deletions(-) diff --git a/arch/arm/include/armv7-m/nvicpri.h b/arch/arm/include/arm_m/nvicpri.h similarity index 95% rename from arch/arm/include/armv7-m/nvicpri.h rename to arch/arm/include/arm_m/nvicpri.h index 401487b91d1..df2712bb637 100644 --- a/arch/arm/include/armv7-m/nvicpri.h +++ b/arch/arm/include/arm_m/nvicpri.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/include/armv7-m/nvicpri.h + * arch/arm/include/arm_m/nvicpri.h * * SPDX-License-Identifier: Apache-2.0 * @@ -20,8 +20,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H -#define __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H +#ifndef __ARCH_ARM_INCLUDE_ARM_M_NVICPRI_H +#define __ARCH_ARM_INCLUDE_ARM_M_NVICPRI_H /**************************************************************************** * Included Files @@ -75,4 +75,4 @@ #define NVIC_SYSH_DISABLE_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT #define NVIC_SYSH_SVCALL_PRIORITY (NVIC_SYSH_PRIORITY_DEFAULT - 1*NVIC_SYSH_PRIORITY_STEP) -#endif /* __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H */ +#endif /* __ARCH_ARM_INCLUDE_ARM_M_NVICPRI_H */ diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h index ddd852895fc..2118cc6e67f 100644 --- a/arch/arm/include/armv7-m/irq.h +++ b/arch/arm/include/armv7-m/irq.h @@ -36,7 +36,7 @@ #include <nuttx/irq.h> #ifndef __ASSEMBLY__ # include <nuttx/compiler.h> -# include <arch/armv7-m/nvicpri.h> +# include <arch/arm_m/nvicpri.h> # include <stdint.h> #endif diff --git a/arch/arm/include/armv8-m/irq.h b/arch/arm/include/armv8-m/irq.h index 8a4269a2a08..0da86fef704 100644 --- a/arch/arm/include/armv8-m/irq.h +++ b/arch/arm/include/armv8-m/irq.h @@ -36,7 +36,7 @@ #include <nuttx/irq.h> #ifndef __ASSEMBLY__ # include <nuttx/compiler.h> -# include <arch/armv8-m/nvicpri.h> +# include <arch/arm_m/nvicpri.h> # include <stdint.h> #endif diff --git a/arch/arm/include/armv8-m/nvicpri.h b/arch/arm/include/armv8-m/nvicpri.h deleted file mode 100644 index 35a77076234..00000000000 --- a/arch/arm/include/armv8-m/nvicpri.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** - * arch/arm/include/armv8-m/nvicpri.h - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -#ifndef __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H -#define __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <arch/chip/chip.h> - -/**************************************************************************** - * Pre-processor Prototypes - ****************************************************************************/ - -/* In the normal cases, interrupts are not nest-able and all interrupts run - * at an execution priority between NVIC_SYSH_PRIORITY_MIN and - * NVIC_SYSH_PRIORITY_MAX (with NVIC_SYSH_PRIORITY_MAX reserved for SVCall). - * - * If, in addition, CONFIG_ARCH_HIPRI_INTERRUPT is defined, then special - * high priority interrupts are supported. These are not "nested" in the - * normal sense of the word. These high priority interrupts can interrupt - * normal processing but execute outside of OS (although they can "get back - * into the game" via a PendSV interrupt). - * - * In the normal course of things, interrupts must occasionally be disabled - * using the up_irq_save() inline function to prevent contention in use of - * resources that may be shared between interrupt level and non-interrupt - * level logic. Now the question arises, if we are using - * CONFIG_ARCH_HIPRI_INTERRUPT=y, do we disable all interrupts except - * SVCall (we cannot disable SVCall interrupts). Or do we only disable the - * "normal" interrupts? - * - * If we are using the BASEPRI register to disable interrupts, then the - * answer is that we must disable ONLY the "normal interrupts". That - * is because we cannot disable SVCALL interrupts and we cannot permit - * SVCAll interrupts running at a higher priority than the high priority - * interrupts (otherwise, they will introduce jitter in the high priority - * interrupt response time.) - * - * Hence, if you need to disable the high priority interrupt, you will have - * to disable the interrupt either at the peripheral that generates the - * interrupt or at the NVIC. Disabling global interrupts via the BASEPRI - * register cannot effect high priority interrupts. - */ - -/* The high priority interrupt must be highest priority. This prevents - * SVCALL handling from adding jitter to high priority interrupt response. - * Disabling interrupts will disable all interrupts EXCEPT SVCALL and the - * high priority interrupts. - */ - -#define NVIC_SYSH_MAXNORMAL_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT -#define NVIC_SYSH_HIGH_PRIORITY (NVIC_SYSH_PRIORITY_DEFAULT - 2*NVIC_SYSH_PRIORITY_STEP) -#define NVIC_SYSH_DISABLE_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT -#define NVIC_SYSH_SVCALL_PRIORITY (NVIC_SYSH_PRIORITY_DEFAULT - 1*NVIC_SYSH_PRIORITY_STEP) - -#endif /* __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H */ diff --git a/arch/arm/src/armv7-m/arm_exception.S b/arch/arm/src/armv7-m/arm_exception.S index 67661583bd1..5e3b63f5eaa 100644 --- a/arch/arm/src/armv7-m/arm_exception.S +++ b/arch/arm/src/armv7-m/arm_exception.S @@ -42,7 +42,7 @@ #include <nuttx/config.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "exc_return.h" diff --git a/arch/arm/src/armv7-m/arm_initialstate.c b/arch/arm/src/armv7-m/arm_initialstate.c index 43b96b615ee..82497ad2a3a 100644 --- a/arch/arm/src/armv7-m/arm_initialstate.c +++ b/arch/arm/src/armv7-m/arm_initialstate.c @@ -31,7 +31,7 @@ #include <string.h> #include <nuttx/arch.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "psr.h" diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c b/arch/arm/src/armv7-m/arm_schedulesigaction.c index b6ccfccd260..747724552ef 100644 --- a/arch/arm/src/armv7-m/arm_schedulesigaction.c +++ b/arch/arm/src/armv7-m/arm_schedulesigaction.c @@ -33,7 +33,7 @@ #include <nuttx/debug.h> #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "psr.h" #include "exc_return.h" diff --git a/arch/arm/src/armv8-m/arm_exception.S b/arch/arm/src/armv8-m/arm_exception.S index bd5a40b1882..7bbc07d88e9 100644 --- a/arch/arm/src/armv8-m/arm_exception.S +++ b/arch/arm/src/armv8-m/arm_exception.S @@ -42,7 +42,7 @@ #include <nuttx/config.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "exc_return.h" diff --git a/arch/arm/src/armv8-m/arm_initialstate.c b/arch/arm/src/armv8-m/arm_initialstate.c index c1da5458149..0434ed0dcdb 100644 --- a/arch/arm/src/armv8-m/arm_initialstate.c +++ b/arch/arm/src/armv8-m/arm_initialstate.c @@ -32,7 +32,7 @@ #include <nuttx/arch.h> #include <tls/tls.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "psr.h" diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c index 5f7a18488b9..7962b12842c 100644 --- a/arch/arm/src/armv8-m/arm_schedulesigaction.c +++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c @@ -33,7 +33,7 @@ #include <nuttx/debug.h> #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "psr.h" #include "exc_return.h" diff --git a/arch/arm/src/at32/at32_irq.c b/arch/arm/src/at32/at32_irq.c index a82b26b7e9e..a1192892142 100644 --- a/arch/arm/src/at32/at32_irq.c +++ b/arch/arm/src/at32/at32_irq.c @@ -34,7 +34,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #ifdef CONFIG_ARCH_RAMVECTORS diff --git a/arch/arm/src/common/stm32/stm32_irq_m33_v1.c b/arch/arm/src/common/stm32/stm32_irq_m33_v1.c index e3032bfa469..37ac41df05e 100644 --- a/arch/arm/src/common/stm32/stm32_irq_m33_v1.c +++ b/arch/arm/src/common/stm32/stm32_irq_m33_v1.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/common/stm32/stm32_irq_m3m4_v1.c b/arch/arm/src/common/stm32/stm32_irq_m3m4_v1.c index c79c0bddd8d..9c7418394da 100644 --- a/arch/arm/src/common/stm32/stm32_irq_m3m4_v1.c +++ b/arch/arm/src/common/stm32/stm32_irq_m3m4_v1.c @@ -34,7 +34,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #ifdef CONFIG_ARCH_RAMVECTORS diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 5d1fad66df9..285f90c7535 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -33,7 +33,7 @@ #include <nuttx/debug.h> #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c index 7531030df65..7687937ff43 100644 --- a/arch/arm/src/eoss3/eoss3_irq.c +++ b/arch/arm/src/eoss3/eoss3_irq.c @@ -33,7 +33,7 @@ #include <nuttx/debug.h> #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/gd32f4/gd32f4xx_irq.c b/arch/arm/src/gd32f4/gd32f4xx_irq.c index aabdc4463aa..9d1f4e13629 100644 --- a/arch/arm/src/gd32f4/gd32f4xx_irq.c +++ b/arch/arm/src/gd32f4/gd32f4xx_irq.c @@ -34,7 +34,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #ifdef CONFIG_ARCH_RAMVECTORS diff --git a/arch/arm/src/gd32w51x/gd32w51x_irq.c b/arch/arm/src/gd32w51x/gd32w51x_irq.c index 84678d3c032..7f622199241 100644 --- a/arch/arm/src/gd32w51x/gd32w51x_irq.c +++ b/arch/arm/src/gd32w51x/gd32w51x_irq.c @@ -35,7 +35,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/ht32f491x3/ht32f491x3_irq.c b/arch/arm/src/ht32f491x3/ht32f491x3_irq.c index a099cbee5e4..7e242389bba 100644 --- a/arch/arm/src/ht32f491x3/ht32f491x3_irq.c +++ b/arch/arm/src/ht32f491x3/ht32f491x3_irq.c @@ -34,7 +34,7 @@ #include <nuttx/arch.h> #include <nuttx/irq.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #ifdef CONFIG_ARCH_RAMVECTORS diff --git a/arch/arm/src/imx9/imx9_irq.c b/arch/arm/src/imx9/imx9_irq.c index c2b6c4e2ece..5c005951738 100644 --- a/arch/arm/src/imx9/imx9_irq.c +++ b/arch/arm/src/imx9/imx9_irq.c @@ -36,7 +36,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c index 8fde98793f7..1b6acca8ed8 100644 --- a/arch/arm/src/imxrt/imxrt_irq.c +++ b/arch/arm/src/imxrt/imxrt_irq.c @@ -35,7 +35,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index 68f7fdba1ee..34cd9bc6ff4 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c index ed4a5931c43..95df6cbd492 100644 --- a/arch/arm/src/lc823450/lc823450_irq.c +++ b/arch/arm/src/lc823450/lc823450_irq.c @@ -35,7 +35,7 @@ #include <nuttx/spinlock.h> #include <nuttx/board.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c index f1396a42c87..fe66dc3b7c1 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index 2aed1e78b25..14ba59494a0 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c index 4c003fdb12f..169315e155e 100644 --- a/arch/arm/src/lpc54xx/lpc54_irq.c +++ b/arch/arm/src/lpc54xx/lpc54_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c index 186e2be3c5b..cd234553292 100644 --- a/arch/arm/src/max326xx/common/max326_irq.c +++ b/arch/arm/src/max326xx/common/max326_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/mcx-nxxx/nxxx_irq.c b/arch/arm/src/mcx-nxxx/nxxx_irq.c index e0fd0d36dc7..fd48e6a4190 100644 --- a/arch/arm/src/mcx-nxxx/nxxx_irq.c +++ b/arch/arm/src/mcx-nxxx/nxxx_irq.c @@ -35,7 +35,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/mx8mp/mx8mp_irq.c b/arch/arm/src/mx8mp/mx8mp_irq.c index 95f46cd1ad3..7c29918be66 100644 --- a/arch/arm/src/mx8mp/mx8mp_irq.c +++ b/arch/arm/src/mx8mp/mx8mp_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/n32h7/n32_irq.c b/arch/arm/src/n32h7/n32_irq.c index 28d31449ce8..afa39c5f3ff 100644 --- a/arch/arm/src/n32h7/n32_irq.c +++ b/arch/arm/src/n32h7/n32_irq.c @@ -34,7 +34,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c index 6cd804221cb..ebc11365a6e 100644 --- a/arch/arm/src/nrf52/nrf52_irq.c +++ b/arch/arm/src/nrf52/nrf52_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/nrf52/nrf52_sdc.c b/arch/arm/src/nrf52/nrf52_sdc.c index 0e11aac3280..e874283e73d 100644 --- a/arch/arm/src/nrf52/nrf52_sdc.c +++ b/arch/arm/src/nrf52/nrf52_sdc.c @@ -36,7 +36,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/mutex.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include <arch/nrf52/nrf52_irq.h> #include <nuttx/wqueue.h> diff --git a/arch/arm/src/nrf53/nrf53_irq.c b/arch/arm/src/nrf53/nrf53_irq.c index 4dbced7e093..c281813a716 100644 --- a/arch/arm/src/nrf53/nrf53_irq.c +++ b/arch/arm/src/nrf53/nrf53_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/nrf53/nrf53_sdc.c b/arch/arm/src/nrf53/nrf53_sdc.c index a1ed1552c6d..70b5c0cc81e 100644 --- a/arch/arm/src/nrf53/nrf53_sdc.c +++ b/arch/arm/src/nrf53/nrf53_sdc.c @@ -36,7 +36,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/mutex.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include <arch/nrf53/nrf5340_irq_cpunet.h> #include <nuttx/wqueue.h> diff --git a/arch/arm/src/nrf54l/nrf54l_irq.c b/arch/arm/src/nrf54l/nrf54l_irq.c index 501a1f1ee11..7a3dfc4a73e 100644 --- a/arch/arm/src/nrf54l/nrf54l_irq.c +++ b/arch/arm/src/nrf54l/nrf54l_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/nrf54l/nrf54l_sdc.c b/arch/arm/src/nrf54l/nrf54l_sdc.c index 27ea0875425..3af3f6a6d1f 100644 --- a/arch/arm/src/nrf54l/nrf54l_sdc.c +++ b/arch/arm/src/nrf54l/nrf54l_sdc.c @@ -38,7 +38,7 @@ #include <nuttx/arch.h> #include <nuttx/mutex.h> #include <nuttx/kmalloc.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include <nuttx/wqueue.h> #include "arm_internal.h" diff --git a/arch/arm/src/nrf91/nrf91_irq.c b/arch/arm/src/nrf91/nrf91_irq.c index 0fe003e8b20..b5d83e7f220 100644 --- a/arch/arm/src/nrf91/nrf91_irq.c +++ b/arch/arm/src/nrf91/nrf91_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/ra4/ra_irq.c b/arch/arm/src/ra4/ra_irq.c index 40cf751445d..f240a9edfab 100644 --- a/arch/arm/src/ra4/ra_irq.c +++ b/arch/arm/src/ra4/ra_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "arm_internal.h" diff --git a/arch/arm/src/ra8m1/ra_irq.c b/arch/arm/src/ra8m1/ra_irq.c index 8208d5cb9e5..69474cdced3 100644 --- a/arch/arm/src/ra8m1/ra_irq.c +++ b/arch/arm/src/ra8m1/ra_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "arm_internal.h" diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c index d3fbb6f7409..998a59b1690 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "chip.h" #include "nvic.h" diff --git a/arch/arm/src/s32k3xx/s32k3xx_irq.c b/arch/arm/src/s32k3xx/s32k3xx_irq.c index 4136a72ab7c..6164faeb4a6 100644 --- a/arch/arm/src/s32k3xx/s32k3xx_irq.c +++ b/arch/arm/src/s32k3xx/s32k3xx_irq.c @@ -35,7 +35,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include <arch/chip/s32k3x4_irq.h> diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index 0e48261501a..2c85bafa268 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c index 1053aa7855f..487da03839d 100644 --- a/arch/arm/src/samd5e5/sam_irq.c +++ b/arch/arm/src/samd5e5/sam_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 01f42804512..f0a289f94aa 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #ifdef CONFIG_ARCH_RAMVECTORS diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index 60924b8f385..4f4b3d23792 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_irq.c @@ -34,7 +34,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c index 7849e017e60..cf37850e54d 100644 --- a/arch/arm/src/stm32h7/stm32_irq.c +++ b/arch/arm/src/stm32h7/stm32_irq.c @@ -34,7 +34,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index 53ec98f34f6..a5e6bdf4722 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/stm32n6/stm32_irq.c b/arch/arm/src/stm32n6/stm32_irq.c index 5f9f3118b1f..1a8b2ff843f 100644 --- a/arch/arm/src/stm32n6/stm32_irq.c +++ b/arch/arm/src/stm32n6/stm32_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv8-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/stm32wl5/stm32wl5_irq.c b/arch/arm/src/stm32wl5/stm32wl5_irq.c index 3fc635c72f7..c4248e2375f 100644 --- a/arch/arm/src/stm32wl5/stm32wl5_irq.c +++ b/arch/arm/src/stm32wl5/stm32wl5_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c index 58082cfb95c..bcc5a4a747d 100644 --- a/arch/arm/src/tiva/common/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c index 5e5fedaef21..e49129e734c 100644 --- a/arch/arm/src/xmc4/xmc4_irq.c +++ b/arch/arm/src/xmc4/xmc4_irq.c @@ -33,7 +33,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "nvic.h" #include "ram_vectors.h" diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c index e58287f08ed..2ecf21d8130 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_highpri.c @@ -37,7 +37,7 @@ #include <nuttx/signal.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32f1/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32f1/viewtool-stm32f107/src/stm32_highpri.c index e39fbf24823..efbba5b4582 100644 --- a/boards/arm/stm32f1/viewtool-stm32f107/src/stm32_highpri.c +++ b/boards/arm/stm32f1/viewtool-stm32f107/src/stm32_highpri.c @@ -35,7 +35,7 @@ #include <nuttx/signal.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32f3/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32f3/nucleo-f302r8/src/stm32_highpri.c index 2882d646db1..4e8b3167641 100644 --- a/boards/arm/stm32f3/nucleo-f302r8/src/stm32_highpri.c +++ b/boards/arm/stm32f3/nucleo-f302r8/src/stm32_highpri.c @@ -40,7 +40,7 @@ #include <nuttx/analog/ioctl.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32f3/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32f3/nucleo-f334r8/src/stm32_highpri.c index 961fcdd3a3f..53de56833de 100644 --- a/boards/arm/stm32f3/nucleo-f334r8/src/stm32_highpri.c +++ b/boards/arm/stm32f3/nucleo-f334r8/src/stm32_highpri.c @@ -40,7 +40,7 @@ #include <nuttx/analog/ioctl.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c index 50a32802032..dbbd8649a9b 100644 --- a/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c +++ b/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c @@ -48,7 +48,7 @@ #include <nuttx/analog/ioctl.h> #include <nuttx/power/smps.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32f4/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32f4/stm32f429i-disco/src/stm32_highpri.c index 66ec057d07c..d08ac794393 100644 --- a/boards/arm/stm32f4/stm32f429i-disco/src/stm32_highpri.c +++ b/boards/arm/stm32f4/stm32f429i-disco/src/stm32_highpri.c @@ -40,7 +40,7 @@ #include <nuttx/analog/ioctl.h> #include <arch/irq.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h" diff --git a/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c b/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c index 29a481a0ddf..0b6c8564ffd 100644 --- a/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c +++ b/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c @@ -48,7 +48,7 @@ #include <nuttx/analog/ioctl.h> #include <nuttx/power/smps.h> -#include <arch/armv7-m/nvicpri.h> +#include <arch/arm_m/nvicpri.h> #include "arm_internal.h" #include "ram_vectors.h"
