adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

Bluetooth: ISO/BAP: Refactor BIS bitfield

Browse source 
Refactors teh BIS bitfield values used for ISO
and BAP.

Previously BIT(1) meant BIS index 1, which was a Zephyr choice
in the early days of ISO, as the BT Core spec did not use
a bitfield for BIS indexes.

Later the BASS specification came along and defined that
BIT(0) meant BIS index 1, which meant that we had to shift BIS
bitfields between BAP and ISO.

This commit refactors the ISO layer to use BIT(0) for Index 1 now,
which means that there is no longer a need for conversion
between the BAP and ISO layers, and that we can use a value
range defined by a BT Core spec (BASS).

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-07-09 15:28:46 +02:00 committed by Anas Nashif
parent 539f3a1600
commit 8be6db67fc
21 changed files with 48 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/zephyr/bluetooth/iso.h
View file

@ -27,6 +27,7 @@
#include <zephyr/bluetooth/buf.h> #include <zephyr/bluetooth/buf.h>
#include <zephyr/bluetooth/conn.h> #include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/hci.h> #include <zephyr/bluetooth/hci.h>
#include <zephyr/sys/util_macro.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -47,6 +48,16 @@ extern "C" {
*/ */
#define BT_ISO_SDU_BUF_SIZE(mtu) BT_BUF_ISO_SIZE(mtu) #define BT_ISO_SDU_BUF_SIZE(mtu) BT_BUF_ISO_SIZE(mtu)
/**
* Convert BIS index to bit
*
* The BIS indexes start from 0x01, so the lowest allowed bit is
* BIT(0) that represents index 0x01. To synchronize to e.g. BIS
* indexes 0x01 and 0x02, the bitfield value should be BIT(0) | BIT(1).
* As a general notation, to sync to BIS index N use BIT(N - 1).
*/
#define BT_ISO_BIS_INDEX_BIT(x) (BIT((x) - 1))
/** Value to set the ISO data path over HCi. */ /** Value to set the ISO data path over HCi. */
#define BT_ISO_DATA_PATH_HCI 0x00 #define BT_ISO_DATA_PATH_HCI 0x00
@ -548,9 +559,10 @@ struct bt_iso_big_sync_param {
/** /**
* @brief Bitfield of the BISes to sync to * @brief Bitfield of the BISes to sync to
* *
* The BIS indexes start from 0x01, so the lowest allowed bit is * Use @ref BT_ISO_BIS_INDEX_BIT to convert BIS indexes to a bitfield.
* BIT(1) that represents index 0x01. To synchronize to e.g. BIS *
* indexes 0x01 and 0x02, the bitfield value should be BIT(1) | BIT(2). * To synchronize to e.g. BIS indexes 0x01 and 0x02, this can be set to
* BT_ISO_BIS_INDEX_BIT(0x01) | BT_ISO_BIS_INDEX_BIT(0x02).
*/ */
uint32_t bis_bitfield; uint32_t bis_bitfield;

2
samples/bluetooth/bap_broadcast_assistant/src/main.c
View file

@ -181,7 +181,7 @@ static bool add_pa_sync_base_subgroup_bis_cb(const struct bt_bap_base_subgroup_b
{ {
struct bt_bap_bass_subgroup *subgroup_param = user_data; struct bt_bap_bass_subgroup *subgroup_param = user_data;
subgroup_param->bis_sync |= BIT(bis->index); subgroup_param->bis_sync |= BT_ISO_BIS_INDEX_BIT(bis->index);
return true; return true;
} }

4
samples/bluetooth/iso_broadcast_benchmark/src/receiver.c
View file

@ -372,9 +372,9 @@ static int create_big_sync(struct bt_iso_big **big, struct bt_le_per_adv_sync *s
BT_ISO_SYNC_TIMEOUT_MIN, BT_ISO_SYNC_TIMEOUT_MIN,
BT_ISO_SYNC_TIMEOUT_MAX); BT_ISO_SYNC_TIMEOUT_MAX);
big_sync_param.num_bis = bis_count; big_sync_param.num_bis = bis_count;
/* BIS indexes start from 0x01, so add one to `i` */ /* BIS indexes start from 0x01 */
for (int i = 1; i <= big_sync_param.num_bis; i++) { for (int i = 1; i <= big_sync_param.num_bis; i++) {
big_sync_param.bis_bitfield |= BIT(i); big_sync_param.bis_bitfield |= BT_ISO_BIS_INDEX_BIT(i);
} }
LOG_INF("Syncing to BIG"); LOG_INF("Syncing to BIG");

2
samples/bluetooth/iso_receive/src/main.c
View file

@ -276,7 +276,7 @@ static struct bt_iso_chan *bis[] = {
static struct bt_iso_big_sync_param big_sync_param = { static struct bt_iso_big_sync_param big_sync_param = {
.bis_channels = bis, .bis_channels = bis,
.num_bis = BIS_ISO_CHAN_COUNT, .num_bis = BIS_ISO_CHAN_COUNT,
.bis_bitfield = (BIT_MASK(BIS_ISO_CHAN_COUNT) << 1), .bis_bitfield = (BIT_MASK(BIS_ISO_CHAN_COUNT)),
.mse = BT_ISO_SYNC_MSE_ANY, /* any number of subevents */ .mse = BT_ISO_SYNC_MSE_ANY, /* any number of subevents */
.sync_timeout = 100, /* in 10 ms units */ .sync_timeout = 100, /* in 10 ms units */
}; };

2
subsys/bluetooth/audio/bap_base.c
View file

@ -593,7 +593,7 @@ static bool base_subgroup_bis_cb(const struct bt_bap_base_subgroup_bis *bis, voi
{ {
uint32_t *base_bis_index_bitfield = user_data; uint32_t *base_bis_index_bitfield = user_data;
*base_bis_index_bitfield |= BIT(bis->index); *base_bis_index_bitfield |= BT_ISO_BIS_INDEX_BIT(bis->index);
return true; return true;
} }

14
subsys/bluetooth/audio/bap_broadcast_assistant.c
View file

@ -1219,12 +1219,7 @@ int bt_bap_broadcast_assistant_add_src(struct bt_conn *conn,
subgroup = net_buf_simple_add(&att_buf, subgroup_size); subgroup = net_buf_simple_add(&att_buf, subgroup_size);
if (param->subgroups[i].bis_sync != BT_BAP_BIS_SYNC_NO_PREF) { subgroup->bis_sync = param->subgroups[i].bis_sync;
/* The BIS Index bitfield to be sent must use BIT(0) for BIS Index 1 */
subgroup->bis_sync = param->subgroups[i].bis_sync >> 1;
} else {
subgroup->bis_sync = BT_BAP_BIS_SYNC_NO_PREF;
}
CHECKIF(param->pa_sync == 0 && subgroup->bis_sync != 0) { CHECKIF(param->pa_sync == 0 && subgroup->bis_sync != 0) {
LOG_DBG("Only syncing to BIS is not allowed"); LOG_DBG("Only syncing to BIS is not allowed");
@ -1324,12 +1319,7 @@ int bt_bap_broadcast_assistant_mod_src(struct bt_conn *conn,
} }
subgroup = net_buf_simple_add(&att_buf, subgroup_size); subgroup = net_buf_simple_add(&att_buf, subgroup_size);
if (param->subgroups[i].bis_sync != BT_BAP_BIS_SYNC_NO_PREF) { subgroup->bis_sync = param->subgroups[i].bis_sync;
/* The BIS Index bitfield to be sent must use BIT(0) for BIS Index 1 */
subgroup->bis_sync = param->subgroups[i].bis_sync >> 1;
} else {
subgroup->bis_sync = BT_BAP_BIS_SYNC_NO_PREF;
}
CHECKIF(param->pa_sync == 0 && subgroup->bis_sync != 0) { CHECKIF(param->pa_sync == 0 && subgroup->bis_sync != 0) {
LOG_DBG("Only syncing to BIS is not allowed"); LOG_DBG("Only syncing to BIS is not allowed");

13
subsys/bluetooth/audio/bap_broadcast_sink.c
View file

@ -602,7 +602,7 @@ static bool base_subgroup_bis_index_cb(const struct bt_bap_base_subgroup_bis *bi
sink_subgroup = &data->subgroups[data->subgroup_count]; sink_subgroup = &data->subgroups[data->subgroup_count];
sink_bis->index = bis->index; sink_bis->index = bis->index;
sink_subgroup->bis_indexes |= BIT(bis->index); sink_subgroup->bis_indexes |= BT_ISO_BIS_INDEX_BIT(bis->index);
#if CONFIG_BT_AUDIO_CODEC_CFG_MAX_DATA_SIZE > 0 #if CONFIG_BT_AUDIO_CODEC_CFG_MAX_DATA_SIZE > 0
@ -1169,13 +1169,8 @@ int bt_bap_broadcast_sink_sync(struct bt_bap_broadcast_sink *sink, uint32_t inde
return -EINVAL; return -EINVAL;
} }
CHECKIF(indexes_bitfield == 0) { CHECKIF(indexes_bitfield == 0U || indexes_bitfield > BIT_MASK(BT_ISO_BIS_INDEX_MAX)) {
LOG_DBG("indexes_bitfield is 0"); LOG_DBG("Invalid indexes_bitfield: 0x%08X", indexes_bitfield);
return -EINVAL;
}
CHECKIF(indexes_bitfield & BIT(0)) {
LOG_DBG("BIT(0) is not a valid BIS index");
return -EINVAL; return -EINVAL;
} }
@ -1217,7 +1212,7 @@ int bt_bap_broadcast_sink_sync(struct bt_bap_broadcast_sink *sink, uint32_t inde
stream_count = 0; stream_count = 0;
for (int i = 1; i < BT_ISO_MAX_GROUP_ISO_COUNT; i++) { for (int i = 1; i < BT_ISO_MAX_GROUP_ISO_COUNT; i++) {
if ((indexes_bitfield & BIT(i)) != 0) { if ((indexes_bitfield & BT_ISO_BIS_INDEX_BIT(i)) != 0) {
struct bt_audio_codec_cfg *codec_cfg = struct bt_audio_codec_cfg *codec_cfg =
codec_cfg_from_base_by_index(sink, i); codec_cfg_from_base_by_index(sink, i);

3
subsys/bluetooth/audio/bap_internal.h
View file

@ -16,6 +16,7 @@
#include <zephyr/bluetooth/audio/bap.h> #include <zephyr/bluetooth/audio/bap.h>
#include <zephyr/bluetooth/addr.h> #include <zephyr/bluetooth/addr.h>
#include <zephyr/bluetooth/conn.h> #include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/iso.h>
#include <zephyr/sys/util_macro.h> #include <zephyr/sys/util_macro.h>
#include <zephyr/types.h> #include <zephyr/types.h>
@ -135,7 +136,7 @@ static inline bool valid_bis_syncs(uint32_t bis_sync)
return true; return true;
} }
if (bis_sync > BIT_MASK(31)) { /* Max BIS index */ if (bis_sync > BIT_MASK(BT_ISO_MAX_GROUP_ISO_COUNT)) {
return false; return false;
} }

10
subsys/bluetooth/audio/bap_scan_delegator.c
View file

@ -205,7 +205,7 @@ static void net_buf_put_recv_state(const struct bass_recv_state_internal *recv_s
for (int i = 0; i < state->num_subgroups; i++) { for (int i = 0; i < state->num_subgroups; i++) {
const struct bt_bap_bass_subgroup *subgroup = &state->subgroups[i]; const struct bt_bap_bass_subgroup *subgroup = &state->subgroups[i];
(void)net_buf_simple_add_le32(&read_buf, subgroup->bis_sync >> 1); (void)net_buf_simple_add_le32(&read_buf, subgroup->bis_sync);
(void)net_buf_simple_add_u8(&read_buf, subgroup->metadata_len); (void)net_buf_simple_add_u8(&read_buf, subgroup->metadata_len);
(void)net_buf_simple_add_mem(&read_buf, subgroup->metadata, (void)net_buf_simple_add_mem(&read_buf, subgroup->metadata,
subgroup->metadata_len); subgroup->metadata_len);
@ -597,10 +597,6 @@ static int scan_delegator_add_source(struct bt_conn *conn,
} }
internal_state->requested_bis_sync[i] = net_buf_simple_pull_le32(buf); internal_state->requested_bis_sync[i] = net_buf_simple_pull_le32(buf);
if (internal_state->requested_bis_sync[i] != BT_BAP_BIS_SYNC_NO_PREF) {
/* Received BIS Index bitfield uses BIT(0) for BIS Index 1 */
internal_state->requested_bis_sync[i] <<= 1;
}
if (internal_state->requested_bis_sync[i] && if (internal_state->requested_bis_sync[i] &&
pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) { pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) {
@ -763,10 +759,6 @@ static int scan_delegator_mod_src(struct bt_conn *conn,
old_bis_sync_req = internal_state->requested_bis_sync[i]; old_bis_sync_req = internal_state->requested_bis_sync[i];
internal_state->requested_bis_sync[i] = net_buf_simple_pull_le32(buf); internal_state->requested_bis_sync[i] = net_buf_simple_pull_le32(buf);
if (internal_state->requested_bis_sync[i] != BT_BAP_BIS_SYNC_NO_PREF) {
/* Received BIS Index bitfield uses BIT(0) for BIS Index 1 */
internal_state->requested_bis_sync[i] <<= 1;
}
if (internal_state->requested_bis_sync[i] && if (internal_state->requested_bis_sync[i] &&
pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) { pa_sync == BT_BAP_BASS_PA_REQ_NO_SYNC) {

2
subsys/bluetooth/audio/shell/bap.c
View file

@ -3477,7 +3477,7 @@ static int cmd_sync_broadcast(const struct shell *sh, size_t argc, char *argv[])
return -ENOEXEC; return -ENOEXEC;
} }
bis_bitfield |= BIT(val); bis_bitfield |= BT_ISO_BIS_INDEX_BIT(val);
stream_cnt++; stream_cnt++;
} }
} }

4
subsys/bluetooth/audio/shell/bap_broadcast_assistant.c
View file

@ -879,7 +879,7 @@ static inline bool add_pa_sync_base_subgroup_bis_cb(const struct bt_bap_base_sub
{ {
struct bt_bap_bass_subgroup *subgroup_param = user_data; struct bt_bap_bass_subgroup *subgroup_param = user_data;
subgroup_param->bis_sync |= BIT(bis->index); subgroup_param->bis_sync |= BT_ISO_BIS_INDEX_BIT(bis->index);
return true; return true;
} }
@ -995,7 +995,7 @@ static int cmd_bap_broadcast_assistant_add_pa_sync(const struct shell *sh,
return -ENOEXEC; return -ENOEXEC;
} }
bis_bitfield_req |= BIT(index); bis_bitfield_req |= BT_ISO_BIS_INDEX_BIT(index);
} }
param.subgroups = subgroup_params; param.subgroups = subgroup_params;

4
subsys/bluetooth/host/iso.c
View file

@ -3296,7 +3296,7 @@ static int hci_le_big_create_sync(const struct bt_le_per_adv_sync *sync, struct
req->num_bis = big->num_bis; req->num_bis = big->num_bis;
/* Transform from bitfield to array */ /* Transform from bitfield to array */
for (int i = 1; i <= BT_ISO_MAX_GROUP_ISO_COUNT; i++) { for (int i = 1; i <= BT_ISO_MAX_GROUP_ISO_COUNT; i++) {
if (param->bis_bitfield & BIT(i)) { if (param->bis_bitfield & BT_ISO_BIS_INDEX_BIT(i)) {
if (bit_idx == big->num_bis) { if (bit_idx == big->num_bis) {
LOG_DBG("BIG cannot contain %u BISes", bit_idx + 1); LOG_DBG("BIG cannot contain %u BISes", bit_idx + 1);
return -EINVAL; return -EINVAL;
@ -3340,7 +3340,7 @@ int bt_iso_big_sync(struct bt_le_per_adv_sync *sync, struct bt_iso_big_sync_para
return -EINVAL; return -EINVAL;
} }
CHECKIF(param->bis_bitfield <= BIT(0)) { CHECKIF(param->bis_bitfield == 0U || param->bis_bitfield > BIT_MASK(BT_ISO_BIS_INDEX_MAX)) {
LOG_DBG("Invalid BIS bitfield 0x%08x", param->bis_bitfield); LOG_DBG("Invalid BIS bitfield 0x%08x", param->bis_bitfield);
return -EINVAL; return -EINVAL;
} }

2
subsys/bluetooth/shell/iso.c
View file

@ -813,7 +813,7 @@ static int cmd_big_sync(const struct shell *sh, size_t argc, char *argv[])
return -ENOEXEC; return -ENOEXEC;
} }
if (bis_bitfield > BIT_MASK(BT_ISO_BIS_INDEX_MAX)) { if (bis_bitfield == 0U || bis_bitfield > BIT_MASK(BT_ISO_BIS_INDEX_MAX)) {
shell_error(sh, "Invalid bis_bitfield: %lu", bis_bitfield); shell_error(sh, "Invalid bis_bitfield: %lu", bis_bitfield);
return -ENOEXEC; return -ENOEXEC;

2
tests/bluetooth/audio/bap_base/src/main.c
View file

@ -221,7 +221,7 @@ ZTEST_F(bap_base_test_suite, test_base_get_bis_indexes)
ret = bt_bap_base_get_bis_indexes(base, &bis_indexes); ret = bt_bap_base_get_bis_indexes(base, &bis_indexes);
zassert_equal(ret, 0, "Unexpected return value: %d", ret); zassert_equal(ret, 0, "Unexpected return value: %d", ret);
zassert_equal(bis_indexes, 0x00000006 /* Bit 1 and 2 */, zassert_equal(bis_indexes, 0x00000003 /* Bit 1 and 2 */,
"Unexpected BIS index value: 0x%08X", bis_indexes); "Unexpected BIS index value: 0x%08X", bis_indexes);
} }

2
tests/bluetooth/audio/cap_commander/src/test_broadcast_reception.c
View file

@ -92,7 +92,7 @@ static void test_start_param_init(void *f)
fixture->start_param.count = ARRAY_SIZE(fixture->start_member_params); fixture->start_param.count = ARRAY_SIZE(fixture->start_member_params);
for (size_t i = 0; i < ARRAY_SIZE(fixture->start_subgroups); i++) { for (size_t i = 0; i < ARRAY_SIZE(fixture->start_subgroups); i++) {
fixture->start_subgroups[i].bis_sync = 1 << i; fixture->start_subgroups[i].bis_sync = i;
fixture->start_subgroups[i].metadata_len = 0; fixture->start_subgroups[i].metadata_len = 0;
} }

2
tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
View file

@ -609,7 +609,7 @@ static bool base_subgroup_bis_cb(const struct bt_bap_base_subgroup_bis *bis, voi
struct bt_audio_codec_cfg *codec_cfg = &parse_data->codec_cfg; struct bt_audio_codec_cfg *codec_cfg = &parse_data->codec_cfg;
struct btp_bap_broadcast_remote_source *broadcaster = parse_data->broadcaster; struct btp_bap_broadcast_remote_source *broadcaster = parse_data->broadcaster;
parse_data->bis_bitfield |= BIT(bis->index); parse_data->bis_bitfield |= BT_ISO_BIS_INDEX_BIT(bis->index);
if (parse_data->stream_cnt < ARRAY_SIZE(broadcaster->streams)) { if (parse_data->stream_cnt < ARRAY_SIZE(broadcaster->streams)) {
struct btp_bap_broadcast_stream *stream = struct btp_bap_broadcast_stream *stream =

4
tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
View file

@ -452,7 +452,7 @@ static void test_bass_mod_source(void)
mod_src_param.pa_sync = true; mod_src_param.pa_sync = true;
mod_src_param.subgroups = &subgroup; mod_src_param.subgroups = &subgroup;
mod_src_param.pa_interval = g_broadcaster_info.interval; mod_src_param.pa_interval = g_broadcaster_info.interval;
subgroup.bis_sync = BIT(1) | BIT(2); /* Indexes 1 and 2 */ subgroup.bis_sync = BT_ISO_BIS_INDEX_BIT(1) | BT_ISO_BIS_INDEX_BIT(2); /* Indexes 1 and 2 */
subgroup.metadata_len = 0; subgroup.metadata_len = 0;
err = bt_bap_broadcast_assistant_mod_src(default_conn, &mod_src_param); err = bt_bap_broadcast_assistant_mod_src(default_conn, &mod_src_param);
@ -482,7 +482,7 @@ static void test_bass_mod_source_long_meta(void)
mod_src_param.pa_sync = true; mod_src_param.pa_sync = true;
mod_src_param.subgroups = &subgroup; mod_src_param.subgroups = &subgroup;
mod_src_param.pa_interval = g_broadcaster_info.interval; mod_src_param.pa_interval = g_broadcaster_info.interval;
subgroup.bis_sync = BIT(1) | BIT(2); subgroup.bis_sync = BT_ISO_BIS_INDEX_BIT(1) | BT_ISO_BIS_INDEX_BIT(2);
subgroup.metadata_len = sizeof(metadata); subgroup.metadata_len = sizeof(metadata);
memcpy(subgroup.metadata, metadata, sizeof(metadata)); memcpy(subgroup.metadata, metadata, sizeof(metadata));

6
tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
View file

@ -804,7 +804,7 @@ static void test_broadcast_sync_inval(void)
return; return;
} }
bis_index = BIT(0); bis_index = BT_ISO_BIS_INDEX_BIT(BT_ISO_BIS_INDEX_MAX + 1);
err = bt_bap_broadcast_sink_sync(g_sink, bis_index, streams, NULL); err = bt_bap_broadcast_sink_sync(g_sink, bis_index, streams, NULL);
if (err == 0) { if (err == 0) {
FAIL("bt_bap_broadcast_sink_sync did not fail with invalid BIS indexes: 0x%08X\n", FAIL("bt_bap_broadcast_sink_sync did not fail with invalid BIS indexes: 0x%08X\n",
@ -821,7 +821,7 @@ static void test_broadcast_sync_inval(void)
memcpy(tmp_streams, streams, sizeof(streams)); memcpy(tmp_streams, streams, sizeof(streams));
bis_index = 0U; bis_index = 0U;
for (size_t i = 0U; i < ARRAY_SIZE(tmp_streams); i++) { for (size_t i = 0U; i < ARRAY_SIZE(tmp_streams); i++) {
bis_index |= BIT(i + BT_ISO_BIS_INDEX_MIN); bis_index |= BT_ISO_BIS_INDEX_BIT(i);
} }
err = bt_bap_broadcast_sink_sync(g_sink, bis_index, tmp_streams, NULL); err = bt_bap_broadcast_sink_sync(g_sink, bis_index, tmp_streams, NULL);
@ -833,7 +833,7 @@ static void test_broadcast_sync_inval(void)
bis_index = 0U; bis_index = 0U;
for (size_t i = 0U; i < CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT + 1; i++) { for (size_t i = 0U; i < CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT + 1; i++) {
bis_index |= BIT(i + BT_ISO_BIS_INDEX_MIN); bis_index |= BT_ISO_BIS_INDEX_BIT(i);
} }
err = bt_bap_broadcast_sink_sync(g_sink, bis_index, tmp_streams, NULL); err = bt_bap_broadcast_sink_sync(g_sink, bis_index, tmp_streams, NULL);

3
tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
View file

@ -16,6 +16,7 @@
#include <zephyr/bluetooth/bluetooth.h> #include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/byteorder.h> #include <zephyr/bluetooth/byteorder.h>
#include <zephyr/bluetooth/gap.h> #include <zephyr/bluetooth/gap.h>
#include <zephyr/bluetooth/iso.h>
#include <zephyr/bluetooth/uuid.h> #include <zephyr/bluetooth/uuid.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/net/buf.h> #include <zephyr/net/buf.h>
@ -650,7 +651,7 @@ static int sync_broadcast(struct sync_state *state)
/* We don't actually need to sync to the BIG/BISes */ /* We don't actually need to sync to the BIG/BISes */
err = bt_bap_scan_delegator_set_bis_sync_state(state->src_id, err = bt_bap_scan_delegator_set_bis_sync_state(state->src_id,
(uint32_t []){ BIT(1) }); (uint32_t[]){BT_ISO_BIS_INDEX_BIT(1)});
if (err) { if (err) {
return err; return err;
} }

2
tests/bsim/bluetooth/host/iso/bis/src/bis_receiver.c
View file

@ -223,7 +223,7 @@ static void sync_big(struct bt_le_per_adv_sync *sync, uint8_t cnt, struct bt_iso
struct bt_iso_chan *bis_channels[CONFIG_BT_ISO_MAX_CHAN]; struct bt_iso_chan *bis_channels[CONFIG_BT_ISO_MAX_CHAN];
struct bt_iso_big_sync_param param = { struct bt_iso_big_sync_param param = {
.sync_timeout = interval_to_sync_timeout(broadcaster_info.interval), .sync_timeout = interval_to_sync_timeout(broadcaster_info.interval),
.bis_bitfield = BIT_MASK(cnt) << 1U, /* BIS indexes start from 1, thus shift by 1 */ .bis_bitfield = BIT_MASK(cnt),
.bis_channels = bis_channels, .bis_channels = bis_channels,
.mse = BT_ISO_SYNC_MSE_MIN, .mse = BT_ISO_SYNC_MSE_MIN,
.encryption = false, .encryption = false,

4
tests/bsim/bluetooth/ll/bis/src/main.c
View file

@ -907,7 +907,7 @@ static void test_iso_recv_main(void)
bis_iso_qos.rx = &iso_rx_qos; bis_iso_qos.rx = &iso_rx_qos;
big_param.bis_channels = bis_channels; big_param.bis_channels = bis_channels;
big_param.num_bis = BIS_ISO_CHAN_COUNT; big_param.num_bis = BIS_ISO_CHAN_COUNT;
big_param.bis_bitfield = BIT(1); /* BIS 1 selected */ big_param.bis_bitfield = BT_ISO_BIS_INDEX_BIT(1); /* BIS 1 selected */
big_param.mse = 1; big_param.mse = 1;
big_param.sync_timeout = 100; /* 1000 ms */ big_param.sync_timeout = 100; /* 1000 ms */
big_param.encryption = false; big_param.encryption = false;
@ -1124,7 +1124,7 @@ static void test_iso_recv_vs_dp_main(void)
bis_iso_qos.rx = &iso_rx_qos; bis_iso_qos.rx = &iso_rx_qos;
big_param.bis_channels = bis_channels; big_param.bis_channels = bis_channels;
big_param.num_bis = BIS_ISO_CHAN_COUNT; big_param.num_bis = BIS_ISO_CHAN_COUNT;
big_param.bis_bitfield = BIT(1); /* BIS 1 selected */ big_param.bis_bitfield = BT_ISO_BIS_INDEX_BIT(1); /* BIS 1 selected */
big_param.mse = 1; big_param.mse = 1;
big_param.sync_timeout = 100; /* 1000 ms */ big_param.sync_timeout = 100; /* 1000 ms */
big_param.encryption = false; big_param.encryption = false;