Change application entry point name back to app_main

diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 664b21ff6495b84ae8eb22bd1f874ace29ecd482..3abebde94784dc1a64f7840c6fb384c29f348953 100644 (file)
--- 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 b2ffc774986c01fd1bdca609e29552ffa4eff745..7f5dda5ec56d73cc976a9445a59ee7912e19ec2b 100755 (executable)
--- 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;
 }