michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ISO: Add iso accept info struct

Browse source 
Add a new struct that provides information to the upper
layer when accepting an connected isochronous stream.

The CIG ID and CIS ID makes it possible for the upper layer
to determine which ISO channels are "together" in a group.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-09-21 14:44:04 +02:00 • committed by Christopher Friedt
commit 8d20e8d5bc
5 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/bluetooth/iso.h
View file

@ -453,6 +453,23 @@ struct bt_iso_chan_ops {
void (*sent)(struct bt_iso_chan *chan); void (*sent)(struct bt_iso_chan *chan);
}; };
struct bt_iso_accept_info {
/** The ACL connection that is requesting authorization */
struct bt_conn *acl;
/** @brief The ID of the connected isochronous group (CIG) on the central
*
* The ID is unique per ACL
*/
uint8_t cig_id;
/** @brief The ID of the connected isochronous stream (CIS) on the central
*
* This ID is unique within a CIG
*/
uint8_t cis_id;
};
/** @brief ISO Server structure. */ /** @brief ISO Server structure. */
struct bt_iso_server { struct bt_iso_server {
/** Required minimim security level */ /** Required minimim security level */
@ -463,12 +480,13 @@ struct bt_iso_server {
* This callback is called whenever a new incoming connection requires * This callback is called whenever a new incoming connection requires
* authorization. * authorization.
* *
* @param acl The ACL connection that is requesting authorization * @param info The ISO accept information structure
* @param chan Pointer to receive the allocated channel * @param chan Pointer to receive the allocated channel
* *
* @return 0 in case of success or negative value in case of error. * @return 0 in case of success or negative value in case of error.
*/ */
int (*accept)(struct bt_conn *acl, struct bt_iso_chan **chan); int (*accept)(const struct bt_iso_accept_info *info,
struct bt_iso_chan **chan);
}; };
/** @brief Register ISO server. /** @brief Register ISO server.

5
samples/bluetooth/iso_connected_benchmark/src/main.c
View file

@ -273,9 +273,10 @@ static struct bt_iso_chan_ops iso_ops = {
.disconnected = iso_disconnected, .disconnected = iso_disconnected,
}; };
static int iso_accept(struct bt_conn *acl, struct bt_iso_chan **chan) static int iso_accept(const struct bt_iso_accept_info *info,
struct bt_iso_chan **chan)
{ {
LOG_INF("Incoming ISO request from %p", (void *)acl); LOG_INF("Incoming ISO request from %p", (void *)info->acl);
for (int i = 0; i < ARRAY_SIZE(iso_chans); i++) { for (int i = 0; i < ARRAY_SIZE(iso_chans); i++) {
if (iso_chans[i].state == BT_ISO_DISCONNECTED) { if (iso_chans[i].state == BT_ISO_DISCONNECTED) {

5
samples/bluetooth/peripheral_iso/src/main.c
View file

@ -125,9 +125,10 @@ static struct bt_iso_chan iso_chan = {
.qos = &iso_qos, .qos = &iso_qos,
}; };
static int iso_accept(struct bt_conn *acl, struct bt_iso_chan **chan) static int iso_accept(const struct bt_iso_accept_info *info,
struct bt_iso_chan **chan)
{ {
printk("Incoming request from %p\n", (void *)acl); printk("Incoming request from %p\n", (void *)info->acl);
if (iso_chan.iso) { if (iso_chan.iso) {
printk("No channels available\n"); printk("No channels available\n");

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

@ -1239,6 +1239,7 @@ static int hci_le_create_cis(const struct bt_iso_connect_param *param,
int bt_iso_accept(struct bt_conn *acl, struct bt_conn *iso) int bt_iso_accept(struct bt_conn *acl, struct bt_conn *iso)
{ {
struct bt_iso_accept_info accept_info;
struct bt_iso_chan *chan; struct bt_iso_chan *chan;
int err; int err;
@ -1254,7 +1255,11 @@ int bt_iso_accept(struct bt_conn *acl, struct bt_conn *iso)
return -ENOMEM; return -ENOMEM;
} }
err = iso_server->accept(acl, &chan); accept_info.acl = acl;
accept_info.cig_id = iso->iso.cig_id;
accept_info.cis_id = iso->iso.cis_id;
err = iso_server->accept(&accept_info, &chan);
if (err < 0) { if (err < 0) {
BT_ERR("Server failed to accept: %d", err); BT_ERR("Server failed to accept: %d", err);
return err; return err;

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

@ -76,9 +76,11 @@ static struct bt_iso_cig *cig;
NET_BUF_POOL_FIXED_DEFINE(tx_pool, 1, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU), NET_BUF_POOL_FIXED_DEFINE(tx_pool, 1, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
NULL); NULL);
static int iso_accept(struct bt_conn *acl, struct bt_iso_chan **chan) static int iso_accept(const struct bt_iso_accept_info *info,
struct bt_iso_chan **chan)
{ {
shell_print(ctx_shell, "Incoming request from %p", acl); shell_print(ctx_shell, "Incoming request from %p with CIG ID 0x%02X and CIS ID 0x%02X",
info->acl, info->cig_id, info->cis_id);
if (iso_chan.iso) { if (iso_chan.iso) {
shell_print(ctx_shell, "No channels available"); shell_print(ctx_shell, "No channels available");