michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ISO: Update BIS index to start from 0x01

Browse source 
The HCI spec defines the BIS index range as starting from
index 0x01. We had previously implemented it such that it
starts from 0x00, and then simply adding 1 to the index
when sending over HCI. However, this may cause issue with
other HCI, or other SIG defined specification, commands
and events, and thus it is probably simpler if we just
use the HCI defined range.

This commit disallows BIT(0) (representing the BIS
index 0x00) to be set, and removes the addition
of 1 when sending over HCI.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-08-31 09:51:20 +02:00 • committed by Anas Nashif
commit 93bfe7a2c9
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/bluetooth/iso.h
View file

@ -313,7 +313,12 @@ struct bt_iso_big_sync_param {
*/ */
uint8_t num_bis; uint8_t num_bis;
/** Bitfield of the BISes to sync to */ /** Bitfield of the BISes to sync to
*
* The BIS indexes start from 0x01, so the lowest allowed bit is
* 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).
*/
uint32_t bis_bitfield; uint32_t bis_bitfield;
/** @brief Maximum subevents /** @brief Maximum subevents

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

@ -363,7 +363,8 @@ static int create_big_sync(struct bt_iso_big **big, struct bt_le_per_adv_sync *s
sync_timeout_ms = iso_interval_ms * ISO_RETRY_COUNT; sync_timeout_ms = iso_interval_ms * ISO_RETRY_COUNT;
big_sync_param.sync_timeout = CLAMP(sync_timeout_ms / 10, 0x000A, 0x4000); /* 10 ms units */ big_sync_param.sync_timeout = CLAMP(sync_timeout_ms / 10, 0x000A, 0x4000); /* 10 ms units */
big_sync_param.num_bis = bis_count; big_sync_param.num_bis = bis_count;
for (int i = 0; i < big_sync_param.num_bis; i++) { /* BIS indexes start from 0x01, so add one to `i` */
for (int i = 1; i <= big_sync_param.num_bis; i++) {
big_sync_param.bis_bitfield |= BIT(i); big_sync_param.bis_bitfield |= BIT(i);
} }

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

@ -263,7 +263,7 @@ static struct bt_iso_chan *bis[BIS_ISO_CHAN_COUNT] = { &bis_iso_chan };
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(BIS_ISO_CHAN_COUNT) - 1), .bis_bitfield = (BIT_MASK(BIS_ISO_CHAN_COUNT) << 1),
.mse = 1, .mse = 1,
.sync_timeout = 100, /* in 10 ms units */ .sync_timeout = 100, /* in 10 ms units */
}; };

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

@ -1850,13 +1850,13 @@ static int hci_le_big_create_sync(const struct bt_le_per_adv_sync *sync, struct
req->sync_timeout = sys_cpu_to_le16(param->sync_timeout); req->sync_timeout = sys_cpu_to_le16(param->sync_timeout);
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 = 0; 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 & BIT(i)) {
if (bit_idx == big->num_bis) { if (bit_idx == big->num_bis) {
BT_DBG("BIG cannot contain %u BISes", bit_idx + 1); BT_DBG("BIG cannot contain %u BISes", bit_idx + 1);
return -EINVAL; return -EINVAL;
} }
req->bis[bit_idx++] = i + 1; /* indices start from 1 */ req->bis[bit_idx++] = i;
} }
} }
@ -1894,7 +1894,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) { CHECKIF(param->bis_bitfield <= BIT(0)) {
BT_DBG("Invalid BIS bitfield 0x%08x", param->bis_bitfield); BT_DBG("Invalid BIS bitfield 0x%08x", param->bis_bitfield);
return -EINVAL; return -EINVAL;
} }