michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Rename bt_audio_iso to bt_bap_iso

Browse source 
Rename the internal bt_audio_iso struct and API to bt_bap_iso

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-03-01 11:52:29 +01:00 • committed by Carles Cufí
commit e2765d7bd5
13 changed files with 157 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ static void broadcast_source_set_ep_state(struct bt_bap_ep *ep, uint8_t state)
static void broadcast_source_iso_sent(struct bt_iso_chan *chan)
{
struct bt_audio_iso *iso = CONTAINER_OF(chan, struct bt_audio_iso, chan);
struct bt_bap_iso *iso = CONTAINER_OF(chan, struct bt_bap_iso, chan);
const struct bt_bap_stream_ops *ops;
struct bt_bap_stream *stream;
struct bt_bap_ep *ep = iso->tx.ep;
@ -147,7 +147,7 @@ static void broadcast_source_iso_sent(struct bt_iso_chan *chan)
static void broadcast_source_iso_connected(struct bt_iso_chan *chan)
{
struct bt_audio_iso *iso = CONTAINER_OF(chan, struct bt_audio_iso, chan);
struct bt_bap_iso *iso = CONTAINER_OF(chan, struct bt_bap_iso, chan);
const struct bt_bap_stream_ops *ops;
struct bt_bap_stream *stream;
struct bt_bap_ep *ep = iso->tx.ep;
@ -178,7 +178,7 @@ static void broadcast_source_iso_connected(struct bt_iso_chan *chan)
static void broadcast_source_iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
{
struct bt_audio_iso *iso = CONTAINER_OF(chan, struct bt_audio_iso, chan);
struct bt_bap_iso *iso = CONTAINER_OF(chan, struct bt_bap_iso, chan);
const struct bt_bap_stream_ops *ops;
struct bt_bap_stream *stream;
struct bt_bap_ep *ep = iso->tx.ep;
@ -266,7 +266,7 @@ static int broadcast_source_setup_stream(uint8_t index, struct bt_bap_stream *st
struct bt_codec *codec, struct bt_codec_qos *qos,
struct bt_bap_broadcast_source *source)
{
struct bt_audio_iso *iso;
struct bt_bap_iso *iso;
struct bt_bap_ep *ep;
ep = broadcast_source_new_ep(index);
@ -275,19 +275,19 @@ static int broadcast_source_setup_stream(uint8_t index, struct bt_bap_stream *st
return -ENOMEM;
}
iso = bt_audio_iso_new();
iso = bt_bap_iso_new();
if (iso == NULL) {
LOG_DBG("Could not allocate iso");
return -ENOMEM;
}
bt_audio_iso_init(iso, &broadcast_source_iso_ops);
bt_audio_iso_bind_ep(iso, ep);
bt_bap_iso_init(iso, &broadcast_source_iso_ops);
bt_bap_iso_bind_ep(iso, ep);
bt_audio_codec_qos_to_iso_qos(iso->chan.qos->tx, qos);
bt_audio_codec_to_iso_path(iso->chan.qos->tx->path, codec);
bt_audio_iso_unref(iso);
bt_bap_iso_unref(iso);
bt_bap_stream_attach(NULL, stream, ep, codec);
stream->qos = qos;
@ -500,7 +500,7 @@ static void broadcast_source_cleanup(struct bt_bap_broadcast_source *source)
SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&subgroup->streams, stream,
next_stream, _node) {
bt_audio_iso_unbind_ep(stream->ep->iso, stream->ep);
bt_bap_iso_unbind_ep(stream->ep->iso, stream->ep);
stream->ep->stream = NULL;
stream->ep = NULL;
stream->codec = NULL;