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
commit a8a4c327da263115ea1e6bc80cea2fe4046e5f14 Author: Mariusz Skamra <[email protected]> AuthorDate: Fri Nov 15 15:26:01 2024 +0100 btshell: Fix ISO Broadcast Source build without BLE Audio This fixes building ISO Broadcast Source enabled target with BLE Audio functionality disabled. --- apps/btshell/src/cmd.c | 8 ++++---- apps/btshell/src/main.c | 16 ++++++++-------- nimble/host/src/ble_hs.c | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/btshell/src/cmd.c b/apps/btshell/src/cmd.c index a9758e14b..aad564a1a 100644 --- a/apps/btshell/src/cmd.c +++ b/apps/btshell/src/cmd.c @@ -4235,7 +4235,7 @@ static const struct shell_cmd_help sync_stats_help = { #endif #endif -#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) #if MYNEWT_VAL(SHELL_CMD_HELP) static const struct shell_param leaudio_base_add_params[] = { {"adv_instance", "Advertising instance, usage: =<UINT8>"}, @@ -4367,7 +4367,7 @@ static const struct shell_cmd_help leaudio_broadcast_stop_help = { .params = leaudio_broadcast_stop_params, }; #endif -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ static const struct shell_cmd btshell_commands[] = { #if MYNEWT_VAL(BLE_EXT_ADV) @@ -4887,7 +4887,7 @@ static const struct shell_cmd btshell_commands[] = { }, #endif #endif -#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) { .sc_cmd = "base_add", .sc_cmd_func = cmd_leaudio_base_add, @@ -4944,7 +4944,7 @@ static const struct shell_cmd btshell_commands[] = { .help = &leaudio_broadcast_stop_help, #endif }, -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ #if MYNEWT_VAL(BLE_AUDIO_BROADCAST_SINK) { .sc_cmd = "broadcast-sink-start", diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c index 729292765..410fb5a45 100644 --- a/apps/btshell/src/main.c +++ b/apps/btshell/src/main.c @@ -41,10 +41,10 @@ #include "host/ble_gatt.h" #include "host/ble_store.h" #include "host/ble_sm.h" -#if MYNEWT_VAL(BLE_AUDIO) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) #include "audio/ble_audio_broadcast_source.h" #include "audio/ble_audio.h" -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ #include "host/util/util.h" /* Mandatory services. */ @@ -132,7 +132,7 @@ int btshell_full_disc_prev_chr_val; struct ble_sm_sc_oob_data oob_data_local; struct ble_sm_sc_oob_data oob_data_remote; -#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) static struct {struct ble_audio_base *base; uint8_t adv_instance;} btshell_base_list[MYNEWT_VAL(BLE_ISO_MAX_BIGS)]; @@ -181,7 +181,7 @@ static os_membuf_t btshell_big_params_mem[ OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_ISO_MAX_BIGS), sizeof(struct ble_iso_big_params)) ]; static struct os_mempool btshell_big_params_pool; -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ #define XSTR(s) STR(s) #ifndef STR @@ -2768,7 +2768,7 @@ btshell_get_default_own_addr_type(void) return default_own_addr_type; } -#if (MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) static int btshell_base_find_free(void) { @@ -3036,7 +3036,7 @@ btshell_broadcast_stop(uint8_t adv_instance) { return ble_audio_broadcast_stop(adv_instance); } -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ /** * main @@ -3087,7 +3087,7 @@ mynewt_main(int argc, char **argv) "btshell_coc_conn_pool"); assert(rc == 0); #endif -#if (MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) rc = os_mempool_init(&btshell_base_pool, MYNEWT_VAL(BLE_ISO_MAX_BIGS), sizeof(struct ble_audio_base), btshell_base_mem, @@ -3123,7 +3123,7 @@ mynewt_main(int argc, char **argv) sizeof(struct ble_iso_big_params), btshell_big_params_mem, "btshell_big_params_pool"); assert(rc == 0); -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ /* Initialize the NimBLE host configuration. */ ble_hs_cfg.reset_cb = btshell_on_reset; ble_hs_cfg.sync_cb = btshell_on_sync; diff --git a/nimble/host/src/ble_hs.c b/nimble/host/src/ble_hs.c index bac7f02e6..70a4aa6c9 100644 --- a/nimble/host/src/ble_hs.c +++ b/nimble/host/src/ble_hs.c @@ -24,9 +24,9 @@ #include "syscfg/syscfg.h" #include "stats/stats.h" #include "host/ble_hs.h" -#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) #include "audio/ble_audio_broadcast_source.h" -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ #include "ble_hs_priv.h" #include "ble_iso_priv.h" #include "nimble/nimble_npl.h" @@ -759,10 +759,10 @@ ble_hs_init(void) #if MYNEWT_VAL(BLE_ISO) rc = ble_iso_init(); SYSINIT_PANIC_ASSERT(rc == 0); -#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) +#if MYNEWT_VAL(BLE_AUDIO) && MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) rc = ble_audio_broadcast_init(); SYSINIT_PANIC_ASSERT(rc == 0); -#endif +#endif /* BLE_AUDIO && BLE_ISO_BROADCAST_SOURCE */ #endif #if MYNEWT_VAL(BLE_AUDIO_MAX_CODEC_RECORDS)
