From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
The code was assuming only index 0 was to be used which doesn't work
when there are multiple CIS being programmed with different parameters.
---
emulator/btdev.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/emulator/btdev.c b/emulator/btdev.c
index 549f93645684..a04f34d4bdb3 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -5885,6 +5885,7 @@ static void le_cis_estabilished(struct btdev *dev, struct btdev_conn *conn,
if (!evt.status) {
struct btdev *remote = conn->link->dev;
+ int i = conn->handle - ISO_HANDLE;
/* TODO: Figure out if these values makes sense */
memcpy(evt.cig_sync_delay, remote->le_cig.params.c_interval,
@@ -5895,15 +5896,15 @@ static void le_cis_estabilished(struct btdev *dev, struct btdev_conn *conn,
sizeof(remote->le_cig.params.c_interval));
memcpy(evt.p_latency, &remote->le_cig.params.p_interval,
sizeof(remote->le_cig.params.p_interval));
- evt.c_phy = remote->le_cig.cis[0].c_phy;
- evt.p_phy = remote->le_cig.cis[0].p_phy;
+ evt.c_phy = remote->le_cig.cis[i].c_phy;
+ evt.p_phy = remote->le_cig.cis[i].p_phy;
evt.nse = 0x01;
evt.c_bn = 0x01;
evt.p_bn = 0x01;
evt.c_ft = 0x01;
evt.p_ft = 0x01;
- evt.c_mtu = remote->le_cig.cis[0].c_sdu;
- evt.p_mtu = remote->le_cig.cis[0].p_sdu;
+ evt.c_mtu = remote->le_cig.cis[i].c_sdu;
+ evt.p_mtu = remote->le_cig.cis[i].p_sdu;
evt.interval = remote->le_cig.params.c_latency;
}
@@ -5948,7 +5949,7 @@ static int cmd_create_cis_complete(struct btdev *dev, const void *data,
evt.acl_handle = cpu_to_le16(acl->handle);
evt.cis_handle = cpu_to_le16(iso->handle);
evt.cig_id = iso->dev->le_cig.params.cig_id;
- evt.cis_id = iso->dev->le_cig.cis[0].cis_id;
+ evt.cis_id = iso->dev->le_cig.cis[i].cis_id;
le_meta_event(iso->link->dev, BT_HCI_EVT_LE_CIS_REQ, &evt,
sizeof(evt));
--
2.39.2
