From cb76bcdbea0be1cedb3551b3bb0a15c19a62b4dd Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Mon, 14 Feb 2022 12:06:05 +0100 Subject: [PATCH] apps: Add main() wrappers for BabbleSim --- apps/blecent/src/main.c | 17 +++++++++++++++-- apps/bleprph/src/main.c | 17 +++++++++++++++-- apps/btshell/src/main.c | 17 +++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/apps/blecent/src/main.c b/apps/blecent/src/main.c index 788f21158..7f1c5f151 100644 --- a/apps/blecent/src/main.c +++ b/apps/blecent/src/main.c @@ -495,8 +495,8 @@ blecent_on_sync(void) * * @return int NOTE: this function should never return! */ -int -main(void) +static int +main_fn(int argc, char **argv) { int rc; @@ -523,3 +523,16 @@ main(void) 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; +} diff --git a/apps/bleprph/src/main.c b/apps/bleprph/src/main.c index 66f9baccb..60a3aea9d 100644 --- a/apps/bleprph/src/main.c +++ b/apps/bleprph/src/main.c @@ -302,8 +302,8 @@ bleprph_on_sync(void) * * @return int NOTE: this function should never return! */ -int -main(void) +static int +main_fn(int argc, char **argv) { #if MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0 struct image_version ver; @@ -357,3 +357,16 @@ main(void) } 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; +} diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c index 99f0a7979..f4f864e7f 100644 --- a/apps/btshell/src/main.c +++ b/apps/btshell/src/main.c @@ -2557,8 +2557,8 @@ btshell_init_ext_adv_restart(void) * * @return int NOTE: this function should never return! */ -int -main(int argc, char **argv) +static int +main_fn(int argc, char **argv) { int rc; @@ -2634,3 +2634,16 @@ main(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; +}