patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: ISO: Fix missing fallback to HCI for ISO data path

Browse source 
A recent change broke the fallback to using a simple
HCI data path configuration in case that the application
does not provide a data path.

This commit fixes that issue, while retaining the
intended update from the change that broke the fallback,
as well as making the code a bit easier to read
and more documented.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-10-11 13:37:02 +02:00 committed by Christopher Friedt
parent e69b159c34
commit f546ef4cde
1 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,11 +291,42 @@ static int bt_iso_setup_data_path(struct bt_conn *iso)
tx_qos = chan->qos->tx;
rx_qos = chan->qos->rx;
in_path.path = tx_qos && tx_qos->path ? tx_qos->path : &default_path;
in_path.pid = tx_qos ? tx_qos->path->pid : BT_ISO_DATA_PATH_DISABLED;
/* The following code sets the in and out paths for ISO data.
* If the application provides a path for a direction (tx/rx) we use
* that, otherwise we simply fall back to HCI.
*
* If the direction is not set (by whether tx_qos or rx_qos is NULL),
* then we fallback to the HCI path object, but we disable the direction
* in the controller.
*/
out_path.path = rx_qos && rx_qos->path ? rx_qos->path : &default_path;
out_path.pid = rx_qos ? rx_qos->path->pid : BT_ISO_DATA_PATH_DISABLED;
if (tx_qos != NULL) {
if (tx_qos->path != NULL) { /* Use application path */
in_path.path = tx_qos->path;
in_path.pid = tx_qos->path->pid;
} else { /* else fallback to HCI path */
in_path.path = &default_path;
in_path.pid = default_path.pid;
}
} else {
/* Disable TX */
in_path.path = &default_path;
in_path.pid = BT_ISO_DATA_PATH_DISABLED;
}
if (rx_qos != NULL) {
if (rx_qos->path != NULL) { /* Use application path */
out_path.path = rx_qos->path;
out_path.pid = rx_qos->path->pid;
} else { /* else fallback to HCI path */
out_path.path = &default_path;
out_path.pid = default_path.pid;
}
} else {
/* Disable RX */
out_path.path = &default_path;
out_path.pid = BT_ISO_DATA_PATH_DISABLED;
}
if (iso->iso.is_bis) {
/* Only set one data path for BIS as per the spec */