From 2b33768d090ed67a193c27d40c11a0058214925a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 23 Oct 2016 10:39:51 -0600 Subject: [PATCH] Xtensa: Revert back to some XCHAL naming --- arch/xtensa/src/common/xtensa_timer.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/xtensa/src/common/xtensa_timer.h b/arch/xtensa/src/common/xtensa_timer.h index db8c527b94e..ccdfaad3bf6 100644 --- a/arch/xtensa/src/common/xtensa_timer.h +++ b/arch/xtensa/src/common/xtensa_timer.h @@ -56,25 +56,25 @@ #ifndef XT_TIMER_INDEX # if XCHAL_TIMER3_INTERRUPT != XTHAL_TIMER_UNCONFIGURED -# if XTENSA_INT_LEVEL(XCHAL_TIMER3_INTERRUPT) <= XCHAL_EXCM_LEVEL +# if XCHAL_INT_LEVEL(XCHAL_TIMER3_INTERRUPT) <= XCHAL_EXCM_LEVEL # undef XT_TIMER_INDEX # define XT_TIMER_INDEX 3 # endif # endif # if XCHAL_TIMER2_INTERRUPT != XTHAL_TIMER_UNCONFIGURED -# if XTENSA_INT_LEVEL(XCHAL_TIMER2_INTERRUPT) <= XCHAL_EXCM_LEVEL +# if XCHAL_INT_LEVEL(XCHAL_TIMER2_INTERRUPT) <= XCHAL_EXCM_LEVEL # undef XT_TIMER_INDEX # define XT_TIMER_INDEX 2 # endif # endif # if XCHAL_TIMER1_INTERRUPT != XTHAL_TIMER_UNCONFIGURED -# if XTENSA_INT_LEVEL(XCHAL_TIMER1_INTERRUPT) <= XCHAL_EXCM_LEVEL +# if XCHAL_INT_LEVEL(XCHAL_TIMER1_INTERRUPT) <= XCHAL_EXCM_LEVEL # undef XT_TIMER_INDEX # define XT_TIMER_INDEX 1 # endif # endif # if XCHAL_TIMER0_INTERRUPT != XTHAL_TIMER_UNCONFIGURED -# if XTENSA_INT_LEVEL(XCHAL_TIMER0_INTERRUPT) <= XCHAL_EXCM_LEVEL +# if XCHAL_INT_LEVEL(XCHAL_TIMER0_INTERRUPT) <= XCHAL_EXCM_LEVEL # undef XT_TIMER_INDEX # define XT_TIMER_INDEX 0 # endif @@ -86,7 +86,7 @@ #define XT_CCOMPARE (CCOMPARE + XT_TIMER_INDEX) #define XT_TIMER_INTNUM XTENSA_TIMER_INTERRUPT(XT_TIMER_INDEX) -#define XT_TIMER_INTPRI XTENSA_INT_LEVEL(XT_TIMER_INTNUM) +#define XT_TIMER_INTPRI XCHAL_INT_LEVEL(XT_TIMER_INTNUM) #define XT_TIMER_INTEN (1 << XT_TIMER_INTNUM) #if XT_TIMER_INTNUM == XTHAL_TIMER_UNCONFIGURED