freertos: make task{ENTER/EXIT} macros deprecated for external use

Signed-off-by: Mahavir Jain <mahavir@espressif.com>

diff --git a/components/freertos/component.mk b/components/freertos/component.mk
index 7841d8f6947befb144182acc122ef9294af4f77d..a10f84d8004a2e42afcaa3c5d6793bbf4cdf3dec 100644 (file)
--- a/components/freertos/component.mk
+++ b/components/freertos/component.mk
@@ -5,3 +5,5 @@
 COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
 COMPONENT_ADD_INCLUDEDIRS := include
 COMPONENT_PRIV_INCLUDEDIRS := include/freertos
+
+tasks.o event_groups.o timers.o queue.o ringbuf.o: CFLAGS += -D_ESP_FREERTOS_INTERNAL

diff --git a/components/freertos/include/freertos/task.h b/components/freertos/include/freertos/task.h
index 5af62c69c66d503215e2d33d38732e755127bedf..ab605bb301617d98cd109abca44a7b1a1cf24b6c 100644 (file)
--- a/components/freertos/include/freertos/task.h
+++ b/components/freertos/include/freertos/task.h
@@ -233,7 +233,11 @@ typedef enum
  *
  * \ingroup SchedulerControl
  */
+#ifdef _ESP_FREERTOS_INTERNAL
 #define taskENTER_CRITICAL(mux)                portENTER_CRITICAL(mux)
+#else
+#define taskENTER_CRITICAL(mux) _Pragma("GCC warning \"'taskENTER_CRITICAL(mux)' is deprecated in ESP-IDF, consider using 'portENTER_CRITICAL(mux)'\"") portENTER_CRITICAL(mux)
+#endif
 #define taskENTER_CRITICAL_ISR(mux)            portENTER_CRITICAL_ISR(mux)
 
 /**
@@ -247,7 +251,11 @@ typedef enum
  *
  * \ingroup SchedulerControl
  */
+#ifdef _ESP_FREERTOS_INTERNAL
 #define taskEXIT_CRITICAL(mux)                 portEXIT_CRITICAL(mux)
+#else
+#define taskEXIT_CRITICAL(mux) _Pragma("GCC warning \"'taskEXIT_CRITICAL(mux)' is deprecated in ESP-IDF, consider using 'portEXIT_CRITICAL(mux)'\"") portEXIT_CRITICAL(mux)
+#endif
 #define taskEXIT_CRITICAL_ISR(mux)             portEXIT_CRITICAL_ISR(mux)
 
 /**