From f5196d26a62ff791e3d6c76a9801e450d88549b1 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 8 Aug 2018 15:29:29 +0800 Subject: [PATCH] feat(esp8266): Modify header file relationship for app using BITx --- components/esp8266/include/rom/ets_sys.h | 2 -- .../freertos/port/esp8266/include/freertos/FreeRTOSConfig.h | 4 ++++ components/log/include/esp_log.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/esp8266/include/rom/ets_sys.h b/components/esp8266/include/rom/ets_sys.h index 8ced18f2..52d5d2e4 100644 --- a/components/esp8266/include/rom/ets_sys.h +++ b/components/esp8266/include/rom/ets_sys.h @@ -29,8 +29,6 @@ #include "esp8266/eagle_soc.h" -#include "freertos/portmacro.h" - /* interrupt related */ #define ETS_SPI_INUM 2 #define ETS_GPIO_INUM 4 diff --git a/components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h b/components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h index c715c6eb..e39f9716 100644 --- a/components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h @@ -67,6 +67,10 @@ #include "sdkconfig.h" +#ifndef __ASSEMBLER__ +#include "rom/ets_sys.h" +#endif + /*----------------------------------------------------------- * Application specific definitions. * diff --git a/components/log/include/esp_log.h b/components/log/include/esp_log.h index 9e77a032..b2e4b6af 100644 --- a/components/log/include/esp_log.h +++ b/components/log/include/esp_log.h @@ -18,6 +18,7 @@ #include #include #include "sdkconfig.h" +#include "rom/ets_sys.h" #ifdef __cplusplus extern "C" {