Core timer 2 is unusable for FreeRTOS ticks because it triggers a high-level interrup...

diff --git a/components/esp32/intr_alloc.c b/components/esp32/intr_alloc.c
index 1cb2fba5d9de3e153958bba65892f8342b530fc7..bfd6c51206dea0f9b586b0fca2a52de198523cda 100644 (file)
--- a/components/esp32/intr_alloc.c
+++ b/components/esp32/intr_alloc.c
@@ -89,12 +89,6 @@ typedef struct {
 #define INT15RES INTDESC_SPECIAL
 #endif
 
-#if CONFIG_FREERTOS_CORETIMER_2
-#define INT16RES INTDESC_RESVD
-#else
-#define INT16RES INTDESC_SPECIAL
-#endif
-
 //This is basically a software-readable version of the interrupt usage table in include/soc/soc.h
 const static int_desc_t int_desc[32]={
     { 1, INTTP_LEVEL, {INTDESC_RESVD,  INTDESC_RESVD } }, //0
@@ -113,7 +107,7 @@ const static int_desc_t int_desc[32]={
     { 1, INTTP_LEVEL, {INTDESC_NORMAL, INTDESC_NORMAL} }, //13
     { 7, INTTP_LEVEL, {INTDESC_RESVD,  INTDESC_RESVD } }, //14, NMI
     { 3, INTTP_NA,    {INT15RES,       INT15RES      } }, //15
-    { 5, INTTP_NA,    {INT16RES,       INT16RES      } }, //16
+    { 5, INTTP_NA,    {INTDESC_SPECIAL,INTDESC_SPECIAL} }, //16
     { 1, INTTP_LEVEL, {INTDESC_NORMAL, INTDESC_NORMAL} }, //17
     { 1, INTTP_LEVEL, {INTDESC_NORMAL, INTDESC_NORMAL} }, //18
     { 2, INTTP_LEVEL, {INTDESC_NORMAL, INTDESC_NORMAL} }, //19

diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index 15178539b4358ab67ce93d8fa168163d0feb9921..ee2b289ef89ba91f278a0f0dd45a9f4b0f58d49b 100644 (file)
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -30,11 +30,6 @@ config FREERTOS_CORETIMER_1
     help
         Select this to use timer 1
 
-config FREERTOS_CORETIMER_2
-    bool "Timer 2 (int 16, level 5)"
-    help
-        Select this to use timer 2
-
 endchoice
 
 config FREERTOS_HZ

diff --git a/components/freertos/include/freertos/FreeRTOSConfig.h b/components/freertos/include/freertos/FreeRTOSConfig.h
index b2fc077bc3035d92171f59a5725148e98996867a..9deb9f4b5e463a6c2598436baf7f6ff7bbc7bea4 100644 (file)
--- a/components/freertos/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/include/freertos/FreeRTOSConfig.h
@@ -90,10 +90,6 @@
 #define XT_TIMER_INDEX 0
 #elif CONFIG_FREERTOS_CORETIMER_1
 #define XT_TIMER_INDEX 1
-#elif CONFIG_FREERTOS_CORETIMER_2
-#define XT_TIMER_INDEX 2
-#elif CONFIG_FREERTOS_CORETIMER_3
-#define XT_TIMER_INDEX 3
 #endif
 
 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS