You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2023/09/25 12:39:29 UTC
[mynewt-nimble] branch master updated: Update samples to use mynewt_main instead of main
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new acc3ee91 Update samples to use mynewt_main instead of main
acc3ee91 is described below
commit acc3ee912a0b973f85ad912c20e2e390e0d33484
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Sep 25 13:45:02 2023 +0200
Update samples to use mynewt_main instead of main
Mynewt core was updated to use mynewt_main.
---
apps/advertiser/src/main.c | 2 +-
apps/blecent/src/main.c | 17 ++---------------
apps/blecsc/src/main.c | 2 +-
apps/blehci/src/main.c | 17 ++---------------
apps/blehr/src/main.c | 2 +-
apps/blemesh/src/main.c | 7 +------
apps/blemesh_light/src/main.c | 2 +-
apps/blemesh_models_example_1/src/main.c | 7 ++-----
apps/blemesh_models_example_2/src/main.c | 7 ++-----
apps/blemesh_shell/src/main.c | 2 +-
apps/bleprph/src/main.c | 17 ++---------------
apps/blestress/src/main.c | 2 +-
apps/btshell/src/main.c | 21 ++-------------------
apps/bttester/src/main.c | 6 +-----
apps/central/src/main.c | 2 +-
apps/dtm/src/main.c | 2 +-
apps/ext_advertiser/src/main.c | 2 +-
apps/mesh_badge/src/main.c | 3 ++-
apps/peripheral/src/main.c | 2 +-
apps/scanner/src/main.c | 2 +-
babblesim/core/src/main_config.c | 4 ++--
.../hw/mcu/nordic/nrf52_bsim/include/mcu/mcu_sim.h | 2 --
docs/ble_setup/ble_sync_cb.rst | 2 +-
23 files changed, 30 insertions(+), 102 deletions(-)
diff --git a/apps/advertiser/src/main.c b/apps/advertiser/src/main.c
index 486d5c59..245d7410 100644
--- a/apps/advertiser/src/main.c
+++ b/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;
diff --git a/apps/blecent/src/main.c b/apps/blecent/src/main.c
index f794937e..57d5d109 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!
*/
-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;
-}
diff --git a/apps/blecsc/src/main.c b/apps/blecsc/src/main.c
index 5cca6b77..99382408 100644
--- a/apps/blecsc/src/main.c
+++ b/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;
diff --git a/apps/blehci/src/main.c b/apps/blehci/src/main.c
index e97e5427..848d7050 100644
--- a/apps/blehci/src/main.c
+++ b/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;
-}
\ No newline at end of file
diff --git a/apps/blehr/src/main.c b/apps/blehr/src/main.c
index e6dac7ce..dad16c7b 100644
--- a/apps/blehr/src/main.c
+++ b/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;
diff --git a/apps/blemesh/src/main.c b/apps/blemesh/src/main.c
index 56d0476f..e11ceb8f 100644
--- a/apps/blemesh/src/main.c
+++ b/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();
diff --git a/apps/blemesh_light/src/main.c b/apps/blemesh_light/src/main.c
index 70deede1..b90888c2 100644
--- a/apps/blemesh_light/src/main.c
+++ b/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();
diff --git a/apps/blemesh_models_example_1/src/main.c b/apps/blemesh_models_example_1/src/main.c
index 80a69c70..e3ab7559 100644
--- a/apps/blemesh_models_example_1/src/main.c
+++ b/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();
diff --git a/apps/blemesh_models_example_2/src/main.c b/apps/blemesh_models_example_2/src/main.c
index 741367b4..979395d2 100644
--- a/apps/blemesh_models_example_2/src/main.c
+++ b/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();
diff --git a/apps/blemesh_shell/src/main.c b/apps/blemesh_shell/src/main.c
index fcf80127..fb9c9e69 100644
--- a/apps/blemesh_shell/src/main.c
+++ b/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();
diff --git a/apps/bleprph/src/main.c b/apps/bleprph/src/main.c
index 60a3aea9..b9f2d264 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!
*/
-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;
-}
diff --git a/apps/blestress/src/main.c b/apps/blestress/src/main.c
index ec28ed8a..c19e0cdd 100644
--- a/apps/blestress/src/main.c
+++ b/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;
diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c
index 4c4a6bb7..aaa423ea 100644
--- a/apps/btshell/src/main.c
+++ b/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;
-}
diff --git a/apps/bttester/src/main.c b/apps/bttester/src/main.c
index 99dff7e3..24213305 100644
--- a/apps/bttester/src/main.c
+++ b/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();
diff --git a/apps/central/src/main.c b/apps/central/src/main.c
index c088b947..1373ad07 100755
--- a/apps/central/src/main.c
+++ b/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();
diff --git a/apps/dtm/src/main.c b/apps/dtm/src/main.c
index 3b171618..f3e218bc 100644
--- a/apps/dtm/src/main.c
+++ b/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];
diff --git a/apps/ext_advertiser/src/main.c b/apps/ext_advertiser/src/main.c
index ec7649ef..ca450b14 100644
--- a/apps/ext_advertiser/src/main.c
+++ b/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();
diff --git a/apps/mesh_badge/src/main.c b/apps/mesh_badge/src/main.c
index d856d816..b6b931fc 100644
--- a/apps/mesh_badge/src/main.c
+++ b/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;
diff --git a/apps/peripheral/src/main.c b/apps/peripheral/src/main.c
index 28e8afb1..03816b4d 100755
--- a/apps/peripheral/src/main.c
+++ b/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;
diff --git a/apps/scanner/src/main.c b/apps/scanner/src/main.c
index 5158d0d5..016a567c 100644
--- a/apps/scanner/src/main.c
+++ b/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();
diff --git a/babblesim/core/src/main_config.c b/babblesim/core/src/main_config.c
index ef8cb04d..467ae623 100644
--- a/babblesim/core/src/main_config.c
+++ b/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) {
diff --git a/babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/mcu_sim.h b/babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/mcu_sim.h
index 26f6cb98..0cb6fc52 100644
--- a/babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/mcu_sim.h
+++ b/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
diff --git a/docs/ble_setup/ble_sync_cb.rst b/docs/ble_setup/ble_sync_cb.rst
index b14a3582..a01d5147 100644
--- a/docs/ble_setup/ble_sync_cb.rst
+++ b/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();