diff --git a/arch/arm/src/armv6-m/barriers.h b/arch/arm/src/armv6-m/barriers.h index 20c1a089dbe..e0b661bc947 100644 --- a/arch/arm/src/armv6-m/barriers.h +++ b/arch/arm/src/armv6-m/barriers.h @@ -31,12 +31,12 @@ /* ARMv6-M memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") -#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") -#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define arm_dsb() __asm__ __volatile__ ("dsb " : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") +#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory") -#define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) -#define ARM_DMB() arm_dmb(15) +#define ARM_DSB() arm_dsb() +#define ARM_ISB() arm_isb() +#define ARM_DMB() arm_dmb() #endif /* __ARCH_ARM_SRC_ARMV6_M_BARRIERS_H */ diff --git a/arch/arm/src/armv7-a/barriers.h b/arch/arm/src/armv7-a/barriers.h index e8b5d94f93a..2258e4110f5 100644 --- a/arch/arm/src/armv7-a/barriers.h +++ b/arch/arm/src/armv7-a/barriers.h @@ -31,15 +31,15 @@ /* ARMv7-A memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") #define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") #define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") #define arm_nop() __asm__ __volatile__ ("nop\n") #define arm_sev() __asm__ __volatile__ ("sev\n") #define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) #define ARM_DMB() arm_dmb(15) +#define ARM_ISB() arm_isb() #define ARM_NOP() arm_nop() #define ARM_SEV() arm_sev() diff --git a/arch/arm/src/armv7-m/barriers.h b/arch/arm/src/armv7-m/barriers.h index b8d91fddacb..b020427a620 100644 --- a/arch/arm/src/armv7-m/barriers.h +++ b/arch/arm/src/armv7-m/barriers.h @@ -31,12 +31,12 @@ /* ARMv7-M memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") -#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") -#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define arm_dsb() __asm__ __volatile__ ("dsb " : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") +#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory") -#define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) -#define ARM_DMB() arm_dmb(15) +#define ARM_DSB() arm_dsb() +#define ARM_ISB() arm_isb() +#define ARM_DMB() arm_dmb() #endif /* __ARCH_ARM_SRC_ARMV7_M_BARRIERS_H */ diff --git a/arch/arm/src/armv7-r/barriers.h b/arch/arm/src/armv7-r/barriers.h index fe17d57db36..71005f4a4df 100644 --- a/arch/arm/src/armv7-r/barriers.h +++ b/arch/arm/src/armv7-r/barriers.h @@ -31,15 +31,15 @@ /* ARMv7-R memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") #define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") #define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") #define arm_nop() __asm__ __volatile__ ("nop\n") #define arm_sev() __asm__ __volatile__ ("sev\n") #define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) #define ARM_DMB() arm_dmb(15) +#define ARM_ISB() arm_isb() #define ARM_NOP() arm_nop() #define ARM_SEV() arm_sev() diff --git a/arch/arm/src/armv8-m/barriers.h b/arch/arm/src/armv8-m/barriers.h index 789268e567c..22d896989b7 100644 --- a/arch/arm/src/armv8-m/barriers.h +++ b/arch/arm/src/armv8-m/barriers.h @@ -31,12 +31,12 @@ /* ARMv8-M memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") +#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory") #define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") -#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define ARM_ISB() arm_isb() +#define ARM_DMB() arm_dmb() #define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) -#define ARM_DMB() arm_dmb(15) #endif /* __ARCH_ARM_SRC_ARMV8_M_BARRIERS_H */ diff --git a/arch/arm/src/armv8-r/barriers.h b/arch/arm/src/armv8-r/barriers.h index 0fd9f5790ba..7e542eb99d7 100644 --- a/arch/arm/src/armv8-r/barriers.h +++ b/arch/arm/src/armv8-r/barriers.h @@ -31,15 +31,15 @@ /* ARMv8-R memory barriers */ -#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory") #define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory") #define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory") +#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory") #define arm_nop() __asm__ __volatile__ ("nop\n") #define arm_sev() __asm__ __volatile__ ("sev\n") #define ARM_DSB() arm_dsb(15) -#define ARM_ISB() arm_isb(15) #define ARM_DMB() arm_dmb(15) +#define ARM_ISB() arm_isb() #define ARM_NOP() arm_nop() #define ARM_SEV() arm_sev()