michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Add ISO disconnect reason

Browse source 
Adds a disconnect reason in the ISO disconnect callback.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-03-24 16:06:05 +01:00 • committed by Carles Cufí
commit 026da2df03
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/releases/release-notes-2.6.rst
View file

@ -32,6 +32,8 @@ API Changes
* The :c:func:`wait_for_usb_dfu` function now accepts a ``k_timeout_t`` argument instead of * The :c:func:`wait_for_usb_dfu` function now accepts a ``k_timeout_t`` argument instead of
using the ``CONFIG_USB_DFU_WAIT_DELAY_MS`` macro. using the ``CONFIG_USB_DFU_WAIT_DELAY_MS`` macro.
* Added disconnect reason to the :c:func:`disconnected` callback of :c:struct:`bt_iso_chan_ops`.
Deprecated in this release Deprecated in this release
* :c:macro:`DT_CLOCKS_LABEL_BY_IDX`, :c:macro:`DT_CLOCKS_LABEL_BY_NAME`, * :c:macro:`DT_CLOCKS_LABEL_BY_IDX`, :c:macro:`DT_CLOCKS_LABEL_BY_NAME`,

5
include/bluetooth/iso.h
View file

@ -238,9 +238,10 @@ struct bt_iso_chan_ops {
* channel is disconnected, including when a connection gets * channel is disconnected, including when a connection gets
* rejected. * rejected.
* *
* @param chan The channel that has been Disconnected * @param chan The channel that has been Disconnected
* @param reason HCI reason for the disconnection.
*/ */
void (*disconnected)(struct bt_iso_chan *chan); void (*disconnected)(struct bt_iso_chan *chan, uint8_t reason);
/** @brief Channel alloc_buf callback /** @brief Channel alloc_buf callback
* *

2
subsys/bluetooth/host/conn.c
View file

@ -1590,6 +1590,8 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
iso = conn_lookup_iso(conn); iso = conn_lookup_iso(conn);
if (iso) { if (iso) {
iso->err = conn->err;
bt_iso_disconnected(iso); bt_iso_disconnected(iso);
bt_iso_cleanup(iso); bt_iso_cleanup(iso);
bt_conn_unref(iso); bt_conn_unref(iso);

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

@ -766,9 +766,9 @@ static void bt_iso_remove_data_path(struct bt_conn *conn)
hci_le_remove_iso_data_path(conn, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR); hci_le_remove_iso_data_path(conn, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR);
} }
static void bt_iso_chan_disconnected(struct bt_iso_chan *chan) static void bt_iso_chan_disconnected(struct bt_iso_chan *chan, uint8_t reason)
{ {
BT_DBG("%p", chan); BT_DBG("%p, reason 0x%02x", chan, reason);
if (!chan->conn) { if (!chan->conn) {
bt_iso_chan_set_state(chan, BT_ISO_DISCONNECTED); bt_iso_chan_set_state(chan, BT_ISO_DISCONNECTED);
@ -784,7 +784,7 @@ static void bt_iso_chan_disconnected(struct bt_iso_chan *chan)
} }
if (chan->ops->disconnected) { if (chan->ops->disconnected) {
chan->ops->disconnected(chan); chan->ops->disconnected(chan, reason);
} }
} }
@ -807,7 +807,7 @@ void bt_iso_disconnected(struct bt_conn *conn)
bt_iso_remove_data_path(conn); bt_iso_remove_data_path(conn);
SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&conn->channels, chan, next, node) { SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&conn->channels, chan, next, node) {
bt_iso_chan_disconnected(chan); bt_iso_chan_disconnected(chan, conn->err);
} }
} }
@ -1021,7 +1021,7 @@ int bt_iso_chan_disconnect(struct bt_iso_chan *chan)
if (chan->state == BT_ISO_BOUND) { if (chan->state == BT_ISO_BOUND) {
bt_iso_chan_remove(chan->conn, chan); bt_iso_chan_remove(chan->conn, chan);
bt_iso_chan_disconnected(chan); bt_iso_chan_disconnected(chan, BT_HCI_ERR_LOCALHOST_TERM_CONN);
return 0; return 0;
} }
@ -1242,9 +1242,11 @@ static void cleanup_big(struct bt_iso_big *big)
memset(big, 0, sizeof(*big)); memset(big, 0, sizeof(*big));
} }
static void big_disconnect(struct bt_iso_big *big) static void big_disconnect(struct bt_iso_big *big, uint8_t reason)
{ {
for (int i = 0; i < big->num_bis; i++) { for (int i = 0; i < big->num_bis; i++) {
big->bis[i]->conn->err = reason;
bt_iso_disconnected(big->bis[i]->conn); bt_iso_disconnected(big->bis[i]->conn);
} }
} }
@ -1466,7 +1468,7 @@ int bt_iso_big_terminate(struct bt_iso_big *big)
err = hci_le_big_sync_term(big); err = hci_le_big_sync_term(big);
if (!err) { if (!err) {
big_disconnect(big); big_disconnect(big, BT_HCI_ERR_LOCALHOST_TERM_CONN);
cleanup_big(big); cleanup_big(big);
} }
} }
@ -1530,7 +1532,7 @@ void hci_le_big_terminate(struct net_buf *buf)
BT_DBG("BIG[%u] %p terminated", big->handle, big); BT_DBG("BIG[%u] %p terminated", big->handle, big);
big_disconnect(big); big_disconnect(big, evt->reason);
cleanup_big(big); cleanup_big(big);
} }
@ -1556,7 +1558,7 @@ void hci_le_big_sync_established(struct net_buf *buf)
BT_DBG("BIG[%u] %p sync established", big->handle, big); BT_DBG("BIG[%u] %p sync established", big->handle, big);
if (evt->status || evt->num_bis != big->num_bis) { if (evt->status || evt->num_bis != big->num_bis) {
big_disconnect(big); big_disconnect(big, evt->status ? evt->status : BT_HCI_ERR_UNSPECIFIED);
cleanup_big(big); cleanup_big(big);
return; return;
} }
@ -1590,7 +1592,7 @@ void hci_le_big_sync_lost(struct net_buf *buf)
BT_DBG("BIG[%u] %p sync lost", big->handle, big); BT_DBG("BIG[%u] %p sync lost", big->handle, big);
big_disconnect(big); big_disconnect(big, evt->reason);
cleanup_big(big); cleanup_big(big);
} }

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

@ -34,9 +34,9 @@ static void iso_connected(struct bt_iso_chan *chan)
printk("ISO Channel %p connected\n", chan); printk("ISO Channel %p connected\n", chan);
} }
static void iso_disconnected(struct bt_iso_chan *chan) static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
{ {
printk("ISO Channel %p disconnected\n", chan); printk("ISO Channel %p disconnected with reason 0x%02x\n", chan, reason);
} }
static struct bt_iso_chan_ops iso_ops = { static struct bt_iso_chan_ops iso_ops = {