Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

armv7-r: correct the wrong usage of ARMV7A_XX marco

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2022-11-28 17:29:26 +08:00
committed by Petro Karashchenko
parent f243e4f268
commit b71f124b7b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/include/armv7-r/irq.h
+2 -2
View File
@@ -357,7 +357,7 @@ static inline irqstate_t up_irq_save(void)
( (
"\tmrs %0, cpsr\n" "\tmrs %0, cpsr\n"
"\tcpsid i\n" "\tcpsid i\n"
#if defined(CONFIG_ARMV7A_DECODEFIQ) #if defined(CONFIG_ARMV7R_DECODEFIQ)
"\tcpsid f\n" "\tcpsid f\n"
#endif #endif
: "=r" (cpsr) : "=r" (cpsr)
@@ -378,7 +378,7 @@ static inline irqstate_t up_irq_enable(void)
( (
"\tmrs %0, cpsr\n" "\tmrs %0, cpsr\n"
"\tcpsie i\n" "\tcpsie i\n"
#if defined(CONFIG_ARMV7A_DECODEFIQ) #if defined(CONFIG_ARMV7R_DECODEFIQ)
"\tcpsie f\n" "\tcpsie f\n"
#endif #endif
: "=r" (cpsr) : "=r" (cpsr)
arch/arm/src/armv7-r/arm_timer.h
+1 -1
View File
@@ -57,7 +57,7 @@ extern "C"
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARMV7A_HAVE_PTM #ifdef CONFIG_ARMV7R_HAVE_PTM
struct oneshot_lowerhalf_s *arm_timer_initialize(unsigned int freq); struct oneshot_lowerhalf_s *arm_timer_initialize(unsigned int freq);
#else #else
# define arm_timer_initialize(freq) NULL # define arm_timer_initialize(freq) NULL
arch/arm/src/armv7-r/arm_vectors.S
+3 -3
View File
@@ -132,7 +132,7 @@ arm_vectorirq:
/* Switch to SYS mode */ /* Switch to SYS mode */
#ifdef CONFIG_ARMV7A_DECODEFIQ #ifdef CONFIG_ARMV7R_DECODEFIQ
cpsid if, #PSR_MODE_SYS cpsid if, #PSR_MODE_SYS
#else #else
cpsid i, #PSR_MODE_SYS cpsid i, #PSR_MODE_SYS
@@ -242,7 +242,7 @@ arm_vectorsvc:
/* Switch to SYS mode */ /* Switch to SYS mode */
#ifdef CONFIG_ARMV7A_DECODEFIQ #ifdef CONFIG_ARMV7R_DECODEFIQ
cpsid if, #PSR_MODE_SYS cpsid if, #PSR_MODE_SYS
#else #else
cpsid i, #PSR_MODE_SYS cpsid i, #PSR_MODE_SYS
@@ -353,7 +353,7 @@ arm_vectordata:
/* Switch to SYS mode */ /* Switch to SYS mode */
#ifdef CONFIG_ARMV7A_DECODEFIQ #ifdef CONFIG_ARMV7R_DECODEFIQ
cpsid if, #PSR_MODE_SYS cpsid if, #PSR_MODE_SYS
#else #else
cpsid i, #PSR_MODE_SYS cpsid i, #PSR_MODE_SYS