Update samples to use mynewt_main instead of main

apps/advertiser/src/main.c

@@ -114,7 +114,7 @@ on_reset(int reason)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 

apps/blecent/src/main.c

@@ -495,8 +495,8 @@ blecent_on_sync(void)
  *
  * @return int NOTE: this function should never return!
  */
-static int
-main_fn(int argc, char **argv)
+int
+mynewt_main(int argc, char **argv)
 {
  int rc;
 
@@ -523,16 +523,3 @@ main_fn(int argc, char **argv)
 
  return 0;
 }
-
-int
-main(int argc, char **argv)
-{
-#if BABBLESIM
- extern void bsim_init(int argc, char** argv, void *main_fn);
- bsim_init(argc, argv, main_fn);
-#else
- main_fn(argc, argv);
-#endif
-
- return 0;
-}

apps/blecsc/src/main.c

@@ -278,7 +278,7 @@ blecsc_on_sync(void)
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 

apps/blehci/src/main.c

@@ -19,8 +19,8 @@
 
 #include "os/mynewt.h"
 
-static int
-main_fn(int argc, char **argv)
+int
+mynewt_main(int argc, char **argv)
 {
  /* Initialize OS */
  sysinit();
@@ -30,16 +30,3 @@ main_fn(int argc, char **argv)
  }
  return 0;
 }
-
-int
-main(int argc, char **argv)
-{
-#if BABBLESIM
- extern void bsim_init(int argc, char** argv, void *main_fn);
- bsim_init(argc, argv, main_fn);
-#else
- main_fn(argc, argv);
-#endif
-
- return 0;
-}

apps/blehr/src/main.c

@@ -229,7 +229,7 @@ blehr_on_sync(void)
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 

apps/blemesh/src/main.c

@@ -442,13 +442,8 @@ blemesh_on_sync(void)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
-
-#ifdef ARCH_sim
- mcu_sim_parse_args(argc, argv);
-#endif
-
  /* Initialize OS */
  sysinit();
 

apps/blemesh_light/src/main.c

@@ -96,7 +96,7 @@ blemesh_on_sync(void)
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  /* Initialize OS */
  sysinit();

apps/blemesh_models_example_1/src/main.c

@@ -652,12 +652,9 @@ blemesh_on_sync(void)
  console_printf("Mesh initialized\n");
 }
 
-int main(void)
+int
+mynewt_main(int argc, char **argv)
 {
-#ifdef ARCH_sim
- mcu_sim_parse_args(argc, argv);
-#endif
-
  /* Initialize OS */
  sysinit();
 

apps/blemesh_models_example_2/src/main.c

@@ -214,12 +214,9 @@ void bt_initialized(void)
  short_time_multireset_bt_mesh_unprovisioning();
 }
 
-int main(void)
+int
+mynewt_main(int argc, char **argv)
 {
-#ifdef ARCH_sim
- mcu_sim_parse_args(argc, argv);
-#endif
-
  /* Initialize OS */
  sysinit();
 

apps/blemesh_shell/src/main.c

@@ -95,7 +95,7 @@ blemesh_on_sync(void)
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  /* Initialize OS */
  sysinit();

apps/bleprph/src/main.c

@@ -302,8 +302,8 @@ bleprph_on_sync(void)
  *
  * @return int NOTE: this function should never return!
  */
-static int
-main_fn(int argc, char **argv)
+int
+mynewt_main(int argc, char **argv)
 {
 #if MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0
  struct image_version ver;
@@ -357,16 +357,3 @@ main_fn(int argc, char **argv)
  }
  return 0;
 }
-
-int
-main(int argc, char **argv)
-{
-#if BABBLESIM
- extern void bsim_init(int argc, char** argv, void *main_fn);
- bsim_init(argc, argv, main_fn);
-#else
- main_fn(argc, argv);
-#endif
-
- return 0;
-}

apps/blestress/src/main.c

@@ -66,7 +66,7 @@ stress_test_on_sync(void)
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 

apps/btshell/src/main.c

@@ -2626,15 +2626,11 @@ btshell_get_default_own_addr_type(void)
  *
  * @return int NOTE: this function should never return!
  */
-static int
-main_fn(int argc, char **argv)
+int
+mynewt_main(int argc, char **argv)
 {
  int rc;
 
-#ifdef ARCH_sim
- mcu_sim_parse_args(argc, argv);
-#endif
-
  /* Initialize OS */
  sysinit();
 
@@ -2703,16 +2699,3 @@ main_fn(int argc, char **argv)
 
  return 0;
 }
-
-int
-main(int argc, char **argv)
-{
-#if BABBLESIM
- extern void bsim_init(int argc, char** argv, void *main_fn);
- bsim_init(argc, argv, main_fn);
-#else
- main_fn(argc, argv);
-#endif
-
- return 0;
-}

apps/bttester/src/main.c

@@ -48,14 +48,10 @@ on_sync(void)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 
-#ifdef ARCH_sim
- mcu_sim_parse_args(argc, argv);
-#endif
-
  /* Initialize OS */
  sysinit();
 

apps/central/src/main.c

@@ -168,7 +168,7 @@ on_reset(int reason)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
  /* Initialize all packages. */
  sysinit();

apps/dtm/src/main.c

@@ -302,7 +302,7 @@ on_reset(int reason)
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  struct image_version the_version;
  char prompt[50];

apps/ext_advertiser/src/main.c

@@ -526,7 +526,7 @@ on_sync(void)
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
  /* Initialize OS */
  sysinit();

apps/mesh_badge/src/main.c

@@ -360,7 +360,8 @@ int bt_set_name(const char *name)
  return 0;
 }
 
-int main(void)
+int
+mynewt_main(int argc, char **argv)
 {
  int err;
 

apps/peripheral/src/main.c

@@ -145,7 +145,7 @@ on_reset(int reason)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
  int rc;
 

apps/scanner/src/main.c

@@ -243,7 +243,7 @@ on_reset(int reason)
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
  /* Initialize all packages. */
  sysinit();

babblesim/core/src/main_config.c

@@ -47,7 +47,7 @@ main_clean_up_trace_wrap(void)
 }
 
 void
-bsim_init(int argc, char** argv, int (*main_fn)(int argc, char **arg))
+main(int argc, char** argv)
 {
  setvbuf(stdout, NULL, _IOLBF, 512);
  setvbuf(stderr, NULL, _IOLBF, 512);
@@ -64,7 +64,7 @@ bsim_init(int argc, char** argv, int (*main_fn)(int argc, char **arg))
  bs_read_function_names_from_Tsymbols(argv[0]);
 
  nrf_hw_initialize(&args->nrf_hw);
- os_init(main_fn);
+ os_init(mynewt_main);
  os_start();
 
  while (1) {

babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/mcu_sim.h

@@ -27,8 +27,6 @@ extern char *native_flash_file;
 extern char *native_uart_log_file;
 extern const char *native_uart_dev_strs[];
 
-void mcu_sim_parse_args(int argc, char **argv);
-
 void static inline hal_debug_break(void) {}
 
 #ifdef __cplusplus

docs/ble_setup/ble_sync_cb.rst

@@ -65,7 +65,7 @@ reset callbacks.
  }
 
  int
- main(void)
+ mynewt_main(int argc, char **argv)
  {
  /* Initialize all packages. */
  sysinit();