From 7cef0308dc4eb18a09bcd3e4f8bcb7223599de64 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 26 Sep 2016 14:48:41 +0800 Subject: [PATCH] Change application entry point name back to app_main --- components/esp32/cpu_start.c | 4 ++-- examples/04_ble_adv/main/app_bt.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c index 664b21ff64..3abebde947 100644 --- a/components/esp32/cpu_start.c +++ b/components/esp32/cpu_start.c @@ -55,7 +55,7 @@ static bool app_cpu_started = false; static void do_global_ctors(void); static void main_task(void* args); extern void ets_setup_syscalls(void); -extern int main(void); +extern int app_main(void); extern int _bss_start; extern int _bss_end; @@ -166,7 +166,7 @@ static void do_global_ctors(void) static void main_task(void* args) { - main(); + app_main(); vTaskDelete(NULL); } diff --git a/examples/04_ble_adv/main/app_bt.c b/examples/04_ble_adv/main/app_bt.c index b2ffc77498..7f5dda5ec5 100755 --- a/examples/04_ble_adv/main/app_bt.c +++ b/examples/04_ble_adv/main/app_bt.c @@ -197,9 +197,10 @@ void bleAdvtTask(void *pvParameters) } } -int main() +int app_main() { bt_controller_init(); xTaskCreatePinnedToCore(&bleAdvtTask, "bleAdvtTask", 2048, NULL, 5, NULL, 0); + return 0; } -- 2.40.0