michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ISO: extend API for setting SDU interval

Browse source 
The BT Core Spec v5.4 allows separate SDU_Interval to
be set on C_To_P and P_To_C directions,
but this is not possible with the existing interface.

This PR splits the interval parameter in the call to
bt_iso_sig_create into one for C_To_P
and one for P_To_C

It also splits the latency parameter into one for
C_To_P and one for P_To_C

Signed-off-by: Andries Kruithof <andries.kruithof@nordicsemi.no>

Bluetooth: ISO: update UI for extended API

The API for setting the SDU interval and latency have been updated.
This PR also updates the setting of these by the user in the shell
and the iso_connected_benchmark sample

Signed-off-by: Andries Kruithof <andries.kruithof@nordicsemi.no>
This commit is contained in:
Andries Kruithof 2023-10-12 08:52:14 +02:00 • committed by Carles Cufí
commit 8b3b8cf2ad
8 changed files with 329 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

7
samples/bluetooth/central_iso/src/main.c
View file

@ -25,6 +25,7 @@ static struct bt_conn *default_conn;
static struct k_work_delayable iso_send_work;
static struct bt_iso_chan iso_chan;
static uint16_t seq_num;
static uint16_t latency_ms = 10U; /* 10ms */
static uint32_t interval_us = 10U * USEC_PER_MSEC; /* 10 ms */
NET_BUF_POOL_FIXED_DEFINE(tx_pool, 1, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
@ -251,8 +252,10 @@ int main(void)
param.sca = BT_GAP_SCA_UNKNOWN;
param.packing = 0;
param.framing = 0;
param.latency = 10; /* ms */
param.interval = interval_us; /* us */
param.c_to_p_latency = latency_ms; /* ms */
param.p_to_c_latency = latency_ms; /* ms */
param.c_to_p_interval = interval_us; /* us */
param.p_to_c_interval = interval_us; /* us */
err = bt_iso_cig_create(&param, &cig);

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

@ -28,6 +28,11 @@ enum benchmark_role {
ROLE_QUIT
};
enum sdu_dir {
DIR_C_TO_P,
DIR_P_TO_C
};
#define DEFAULT_CIS_RTN 2
#define DEFAULT_CIS_INTERVAL_US 7500
#define DEFAULT_CIS_LATENCY_MS 40
@ -116,8 +121,10 @@ static struct bt_iso_chan_qos iso_qos = {
};
static struct bt_iso_cig_param cig_create_param = {
.interval = DEFAULT_CIS_INTERVAL_US, /* in microseconds */
.latency = DEFAULT_CIS_LATENCY_MS, /* milliseconds */
.c_to_p_interval = DEFAULT_CIS_INTERVAL_US, /* in microseconds */
.p_to_c_interval = DEFAULT_CIS_INTERVAL_US, /* in microseconds */
.c_to_p_latency = DEFAULT_CIS_LATENCY_MS, /* milliseconds */
.p_to_c_latency = DEFAULT_CIS_LATENCY_MS, /* milliseconds */
.sca = BT_GAP_SCA_UNKNOWN,
.packing = DEFAULT_CIS_PACKING,
.framing = DEFAULT_CIS_FRAMING,
@ -179,6 +186,7 @@ static void iso_send(struct bt_iso_chan *chan)
int ret;
struct net_buf *buf;
struct iso_chan_work *chan_work;
uint32_t interval;
chan_work = CONTAINER_OF(chan, struct iso_chan_work, chan);
@ -186,10 +194,13 @@ static void iso_send(struct bt_iso_chan *chan)
return;
}
interval = (role == ROLE_CENTRAL) ?
cig_create_param.c_to_p_interval : cig_create_param.p_to_c_interval;
buf = net_buf_alloc(&tx_pool, K_FOREVER);
if (buf == NULL) {
LOG_ERR("Could not allocate buffer");
k_work_reschedule(&chan_work->send_work, K_USEC(cig_create_param.interval));
k_work_reschedule(&chan_work->send_work, K_USEC(interval));
return;
}
@ -201,7 +212,7 @@ static void iso_send(struct bt_iso_chan *chan)
if (ret < 0) {
LOG_ERR("Unable to send data: %d", ret);
net_buf_unref(buf);
k_work_reschedule(&chan_work->send_work, K_USEC(cig_create_param.interval));
k_work_reschedule(&chan_work->send_work, K_USEC(interval));
return;
}
@ -535,14 +546,18 @@ static int parse_rtn_arg(struct bt_iso_chan_io_qos *qos)
return (int)rtn;
}
static int parse_interval_arg(void)
static int parse_interval_arg(enum sdu_dir direction)
{
char buffer[9];
size_t char_count;
uint64_t interval;
printk("Set interval (us) (current %u, default %u)\n",
cig_create_param.interval, DEFAULT_CIS_INTERVAL_US);
interval = (direction == DIR_C_TO_P) ?
cig_create_param.c_to_p_interval : cig_create_param.p_to_c_interval;
printk("Set %s interval (us) (current %llu, default %u)\n",
(direction == DIR_C_TO_P) ? "C to P" : "P to C",
interval, DEFAULT_CIS_INTERVAL_US);
char_count = get_chars(buffer, sizeof(buffer) - 1);
if (char_count == 0) {
@ -550,7 +565,6 @@ static int parse_interval_arg(void)
}
interval = strtoul(buffer, NULL, 0);
/* TODO: Replace literal ints with a #define once it has been created */
if (interval < BT_ISO_SDU_INTERVAL_MIN || interval > BT_ISO_SDU_INTERVAL_MAX) {
printk("Invalid interval %llu", interval);
return -EINVAL;
@ -559,14 +573,18 @@ static int parse_interval_arg(void)
return (int)interval;
}
static int parse_latency_arg(void)
static int parse_latency_arg(enum sdu_dir direction)
{
char buffer[6];
size_t char_count;
uint64_t latency;
printk("Set latency (ms) (current %u, default %u)\n",
cig_create_param.latency, DEFAULT_CIS_LATENCY_MS);
latency = (direction == DIR_C_TO_P) ?
cig_create_param.c_to_p_latency : cig_create_param.p_to_c_latency;
printk("Set %s latency (ms) (current %llu, default %u)\n",
(direction == DIR_C_TO_P) ? "C to P" : "P to C",
latency, DEFAULT_CIS_LATENCY_MS);
char_count = get_chars(buffer, sizeof(buffer) - 1);
if (char_count == 0) {
@ -805,8 +823,10 @@ static int parse_cis_count_arg(void)
static int parse_cig_args(void)
{
int interval;
int latency;
int c_to_p_interval;
int p_to_c_interval;
int c_to_p_latency;
int p_to_c_latency;
int cis_count;
#if defined(CONFIG_BT_ISO_TEST_PARAMS)
int c_to_p_ft;
@ -822,13 +842,23 @@ static int parse_cig_args(void)
return -EINVAL;
}
interval = parse_interval_arg();
if (interval < 0) {
c_to_p_interval = parse_interval_arg(DIR_C_TO_P);
if (c_to_p_interval < 0) {
return -EINVAL;
}
latency = parse_latency_arg();
if (latency < 0) {
p_to_c_interval = parse_interval_arg(DIR_P_TO_C);
if (p_to_c_interval < 0) {
return -EINVAL;
}
c_to_p_latency = parse_latency_arg(DIR_C_TO_P);
if (c_to_p_latency < 0) {
return -EINVAL;
}
p_to_c_latency = parse_latency_arg(DIR_P_TO_C);
if (p_to_c_latency < 0) {
return -EINVAL;
}
@ -854,8 +884,10 @@ static int parse_cig_args(void)
}
#endif /* CONFIG_BT_ISO_TEST_PARAMS */
cig_create_param.interval = interval;
cig_create_param.latency = latency;
cig_create_param.c_to_p_interval = c_to_p_interval;
cig_create_param.p_to_c_interval = p_to_c_interval;
cig_create_param.c_to_p_latency = c_to_p_latency;
cig_create_param.p_to_c_latency = p_to_c_latency;
cig_create_param.num_cis = cis_count;
#if defined(CONFIG_BT_ISO_TEST_PARAMS)
cig_create_param.c_to_p_ft = c_to_p_ft;
@ -923,9 +955,11 @@ static int change_central_settings(void)
int err;
printk("Change CIG settings (y/N)? (Current settings: cis_count=%u, "
"interval=%u, latency=%u)\n",
cig_create_param.num_cis, cig_create_param.interval,
cig_create_param.latency);
"C to P interval=%u, P to C interval=%u "
"C to P latency=%u, P to C latency=%u)\n",
cig_create_param.num_cis, cig_create_param.c_to_p_interval,
cig_create_param.p_to_c_interval, cig_create_param.c_to_p_latency,
cig_create_param.p_to_c_latency);
c = tolower(console_getchar());
if (c == 'y') {
@ -934,9 +968,12 @@ static int change_central_settings(void)
return err;
}
printk("New settings: cis_count=%u, inteval=%u, latency=%u\n",
cig_create_param.num_cis, cig_create_param.interval,
cig_create_param.latency);
printk("New settings: cis_count=%u, C to P interval=%u, "
"P TO C interval=%u, C to P latency=%u "
"P TO C latency=%u\n",
cig_create_param.num_cis, cig_create_param.c_to_p_interval,
cig_create_param.p_to_c_interval, cig_create_param.c_to_p_latency,
cig_create_param.p_to_c_latency);
}
printk("Change TX settings (y/N)? (Current settings: rtn=%u, "