michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BAP: Broadcast source fix idle state

Browse source 
The idle state was never set, thus providing a poorly
implemented state machine. Updated the code so that unused
code was removed and so that the idle state is properly set.

Optimized the way that a state is set for all endpoints
for a broadcast source with a new function.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-05-09 13:51:02 +02:00 • committed by Carles Cufí
commit c66f210f6b
1 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

35
subsys/bluetooth/audio/bap_broadcast_source.c
View file

@ -104,14 +104,17 @@ static void broadcast_source_set_ep_state(struct bt_bap_ep *ep, uint8_t state)
}
ep->status.state = state;
}
if (state == BT_BAP_EP_STATE_IDLE) {
struct bt_bap_stream *stream = ep->stream;
static void broadcast_source_set_state(struct bt_bap_broadcast_source *source, uint8_t state)
{
struct bt_bap_broadcast_subgroup *subgroup;
if (stream != NULL) {
stream->ep = NULL;
stream->codec = NULL;
ep->stream = NULL;
SYS_SLIST_FOR_EACH_CONTAINER(&source->subgroups, subgroup, _node) {
struct bt_bap_stream *stream;
SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
broadcast_source_set_ep_state(stream->ep, state);
}
}
}
@ -669,7 +672,6 @@ static enum bt_bap_ep_state broadcast_source_get_state(struct bt_bap_broadcast_s
int bt_bap_broadcast_source_create(struct bt_bap_broadcast_source_create_param *param,
struct bt_bap_broadcast_source **out_source)
{
struct bt_bap_broadcast_subgroup *subgroup;
struct bt_bap_broadcast_source *source;
struct bt_codec_qos *qos;
size_t stream_count;
@ -710,6 +712,7 @@ int bt_bap_broadcast_source_create(struct bt_bap_broadcast_source_create_param *
*/
for (size_t i = 0U; i < param->params_count; i++) {
const struct bt_bap_broadcast_source_subgroup_param *subgroup_param;
struct bt_bap_broadcast_subgroup *subgroup;
subgroup_param = &param->params[i];
@ -774,13 +777,7 @@ int bt_bap_broadcast_source_create(struct bt_bap_broadcast_source_create_param *
}
/* Finalize state changes and store information */
SYS_SLIST_FOR_EACH_CONTAINER(&source->subgroups, subgroup, _node) {
struct bt_bap_stream *stream;
SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
broadcast_source_set_ep_state(stream->ep, BT_BAP_EP_STATE_QOS_CONFIGURED);
}
}
broadcast_source_set_state(source, BT_BAP_EP_STATE_QOS_CONFIGURED);
source->qos = qos;
source->packing = param->packing;
@ -980,13 +977,7 @@ int bt_bap_broadcast_source_start(struct bt_bap_broadcast_source *source, struct
return err;
}
SYS_SLIST_FOR_EACH_CONTAINER(&source->subgroups, subgroup, _node) {
SYS_SLIST_FOR_EACH_CONTAINER(&subgroup->streams, stream, _node) {
struct bt_bap_ep *ep = stream->ep;
broadcast_source_set_ep_state(ep, BT_BAP_EP_STATE_ENABLING);
}
}
broadcast_source_set_state(source, BT_BAP_EP_STATE_ENABLING);
return 0;
}
@ -1039,6 +1030,8 @@ int bt_bap_broadcast_source_delete(struct bt_bap_broadcast_source *source)
return -EBADMSG;
}
broadcast_source_set_state(source, BT_BAP_EP_STATE_IDLE);
/* Reset the broadcast source */
broadcast_source_cleanup(source);