修改相关宏定义

components/bt/controller/esp32c3/bt.c

@@ -1521,9 +1521,9 @@ int IRAM_ATTR esp_bt_h4tl_eif_io_event_notify(int event)
 
 uint16_t esp_bt_get_tx_buf_num(void)
 {
-#ifndef CONFIG_IDF_RTOS_RTTHREAD
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
     return l2c_ble_link_get_tx_buf_num();
-#endif
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 }
 
 static void coex_wifi_sleep_set_hook(bool sleep)

components/esp_hw_support/include/rtc_wdt.h

@@ -19,11 +19,11 @@
 * If you use this option RTC_WDT_STAGE_ACTION_RESET_SYSTEM then after reset you can see these messages.
 They can help to understand where the CPUs were when the WDT was triggered.
     W (30) boot: PRO CPU has been reset by WDT.
-    W (30) boot: WDT reset info: PRO CPU PC=0x400xxxxx
-    ... function where it happened
+	W (30) boot: WDT reset info: PRO CPU PC=0x400xxxxx
+	... function where it happened
 
-    W (31) boot: WDT reset info: APP CPU PC=0x400xxxxx
-    ... function where it happened
+	W (31) boot: WDT reset info: APP CPU PC=0x400xxxxx
+	... function where it happened
 
 * If you use this option RTC_WDT_STAGE_ACTION_RESET_RTC then you will see message (rst:0x10 (RTCWDT_RTC_RESET),boot:0x13 (SPI_FAST_FLASH_BOOT))
 without description where were CPUs when it happened.

components/esp_wifi/esp32c3/esp_adapter.c

@@ -473,14 +473,18 @@ static esp_err_t nvs_open_wrapper(const char* name, unsigned int open_mode, nvs_
 
 static void esp_log_writev_wrapper(unsigned int level, const char *tag, const char *format, va_list args)
 {
-    // return esp_log_writev((esp_log_level_t)level,tag,format,args);
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
+    return esp_log_writev((esp_log_level_t)level,tag,format,args);
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 }
 
 static void esp_log_write_wrapper(unsigned int level,const char *tag,const char *format, ...)
 {
     va_list list;
     va_start(list, format);
-    // esp_log_writev((esp_log_level_t)level, tag, format, list);
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
+    esp_log_writev((esp_log_level_t)level, tag, format, list);
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
     va_end(list);
 }
 

components/esp_wifi/src/wifi_init.c

@@ -14,9 +14,9 @@
 #include "esp_private/pm_impl.h"
 #include "esp_private/esp_clk.h"
 #include "esp_wpa.h"
-#ifndef CONFIG_IDF_RTOS_RTTHREAD
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
 #include "esp_netif.h"
-#endif
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 #include "esp_coexist_internal.h"
 #include "esp_phy_init.h"
 #include "phy.h"

components/wpa_supplicant/src/crypto/aes-omac1.c

@@ -40,7 +40,7 @@ static void gf_mulx(u8 *pad)
  * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
  * (SP) 800-38B.
  */
-#ifndef CONFIG_IDF_RTOS_RTTHREAD
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
 int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
 		     const u8 *addr[], const size_t *len, u8 *mac)
 {
@@ -119,7 +119,7 @@ int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
 #else
 extern int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
 		     const u8 *addr[], const size_t *len, u8 *mac);
-#endif
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 
 /**
  * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
@@ -134,7 +134,7 @@ extern int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
  * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
  * (SP) 800-38B.
  */
- #ifndef CONFIG_IDF_RTOS_RTTHREAD
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
 int omac1_aes_128_vector(const u8 *key, size_t num_elem,
 			 const u8 *addr[], const size_t *len, u8 *mac)
 {
@@ -143,7 +143,7 @@ int omac1_aes_128_vector(const u8 *key, size_t num_elem,
 #else
 extern int omac1_aes_128_vector(const u8 *key, size_t num_elem,
 			 const u8 *addr[], const size_t *len, u8 *mac);
-#endif
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 
 /**
  * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
@@ -157,14 +157,14 @@ extern int omac1_aes_128_vector(const u8 *key, size_t num_elem,
  * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
  * (SP) 800-38B.
  */
- #ifndef CONFIG_IDF_RTOS_RTTHREAD
+#if !defined(CONFIG_IDF_RTOS_RTTHREAD)
 int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
 {
 	return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
 }
 #else
 extern int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
-#endif
+#endif /* CONFIG_IDF_RTOS_RTTHREAD */
 
 /**
  * omac1_aes_256 - One-Key CBC MAC (OMAC1) hash with AES-256 (aka AES-CMAC)