kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

cpu/esp8266: funcs must not be called in assert

Browse Source 
In vendor startup code, initialization function were called as parameters of assert statement. With DEVELHELP, they are not called since the assert macro does nothing.
This commit is contained in:
Gunar Schorcht 2019-10-22 18:57:39 +02:00
parent 2c7b9b4fb4
commit 405be02da4
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp8266/Makefile.include
View File

@ -95,7 +95,7 @@ INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/heap/port/esp8266/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/nvs_flash/include
INCLUDES += -I$(ESP8266_RTOS_SDK_DIR)/components/spi_flash/include
CFLAGS += -D__ESP_FILE__=__FILE__ -DDEVELHELP
CFLAGS += -D__ESP_FILE__=__FILE__
CFLAGS += -Wno-unused-parameter -Wformat=0
CFLAGS += -mlongcalls -mtext-section-literals -fstrict-volatile-bitfields
CFLAGS += -fdata-sections -ffunction-sections -fzero-initialized-in-bss

34
cpu/esp8266/vendor/esp-idf/esp8266/source/startup.c vendored
View File

@ -59,13 +59,27 @@ static void user_init_entry(void *param)
syscalls_init ();
#endif
assert(nvs_flash_init() == 0);
assert(wifi_nvs_init() == 0);
assert(esp_rtc_init() == 0);
assert(mac_init() == 0);
assert(base_gpio_init() == 0);
if (nvs_flash_init() != 0) {
assert(0);
}
if (wifi_nvs_init() != 0) {
assert(0);
}
if (esp_rtc_init() != 0) {
assert(0);
}
if (mac_init() != 0) {
assert(0);
}
if (base_gpio_init() != 0) {
assert(0);
};
esp_phy_load_cal_and_init(0);
assert(wifi_timer_init() == 0);
if (wifi_timer_init() != 0) {
assert(0);
}
esp_wifi_set_rx_pbuf_mem_type(WIFI_RX_PBUF_DRAM);
@ -78,7 +92,9 @@ static void user_init_entry(void *param)
#endif
#ifdef CONFIG_ENABLE_PTHREAD
assert(esp_pthread_init() == 0);
if (esp_pthread_init() != 0) {
assert(0);
}
#endif
#ifdef RIOT_VERSION
@ -144,7 +160,9 @@ void call_user_start(size_t start_addr)
#else
wifi_os_init();
assert(wifi_task_create(user_init_entry, "uiT", CONFIG_MAIN_TASK_STACK_SIZE, NULL, wifi_task_get_max_priority()) != NULL);
if (wifi_task_create(user_init_entry, "uiT", CONFIG_MAIN_TASK_STACK_SIZE, NULL, wifi_task_get_max_priority()) == NULL) {
assert(0);
}
wifi_os_start();
#endif