This removes the codec parameter from bt_bap_verify_bis, since it is not used. --- profiles/audio/bap.c | 2 +- src/shared/bap.c | 1 - src/shared/bap.h | 1 - unit/test-bap.c | 8 +------- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 2f37d33eb..6d8289418 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -1198,7 +1198,7 @@ static bool parse_base(struct bap_data *bap_data, struct bt_iso_base *base, } /* Check if this BIS matches any local PAC */ - bt_bap_verify_bis(bap_data->bap, bis_index, &codec, + bt_bap_verify_bis(bap_data->bap, bis_index, merged_caps, &matched_lpac); if (matched_lpac == NULL) { diff --git a/src/shared/bap.c b/src/shared/bap.c index 3381ffdd4..d2a500e48 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -6638,7 +6638,6 @@ struct iovec *bt_bap_merge_caps(struct iovec *l2_caps, struct iovec *l3_caps) } void bt_bap_verify_bis(struct bt_bap *bap, uint8_t bis_index, - struct bt_bap_codec *codec, struct iovec *caps, struct bt_bap_pac **lpac) { diff --git a/src/shared/bap.h b/src/shared/bap.h index 3e68f00e2..bf928bc2d 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -254,7 +254,6 @@ struct iovec *bt_bap_stream_get_base(struct bt_bap_stream *stream); struct iovec *bt_bap_merge_caps(struct iovec *l2_caps, struct iovec *l3_caps); void bt_bap_verify_bis(struct bt_bap *bap, uint8_t bis_index, - struct bt_bap_codec *codec, struct iovec *caps, struct bt_bap_pac **lpac); diff --git a/unit/test-bap.c b/unit/test-bap.c index 4b47d6363..9cfc8c403 100644 --- a/unit/test-bap.c +++ b/unit/test-bap.c @@ -575,22 +575,16 @@ static void bsnk_pac_added(struct bt_bap_pac *pac, void *user_data) struct test_data *data = user_data; struct bt_bap_pac *lpac; struct iovec *cc; - struct bt_bap_codec codec = {0}; struct bt_bap_stream *stream; uint8_t bis_idx = 1; bt_bap_pac_set_ops(pac, &bcast_pac_ops, NULL); - if (data->cfg->vs) - codec.id = 0xff; - else - codec.id = LC3_ID; - for (uint8_t i = 0; i < data->cfg->streams; i++) { cc = bt_bap_merge_caps(&data->cfg->cc, NULL); g_assert(cc); - bt_bap_verify_bis(data->bap, bis_idx++, &codec, cc, &lpac); + bt_bap_verify_bis(data->bap, bis_idx++, cc, &lpac); g_assert(lpac); g_assert(pac == lpac); -- 2.39.2