michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BAP: Move pac record discovery to new callback

Browse source 
Add a new pac_record callback that is used to report the found
PAC records during BAP discovery, rather than calling
the discovery callback with optional values.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-03-23 16:31:36 +01:00 • committed by Carles Cufí
commit 1c304d9d23
6 changed files with 111 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/zephyr/bluetooth/audio/bap.h
View file

@ -1210,24 +1210,37 @@ struct bt_bap_unicast_client_cb {
enum bt_bap_ascs_reason reason); enum bt_bap_ascs_reason reason);
/** /**
* @brief Discover Audio capabilities and endpoints callback function. * @brief Remote Published Audio Capability (PAC) record discovered
* *
* If discovery procedure has complete both cap and ep are set to NULL. * Called when a PAC record has been discovered as part of the discovery procedure.
* *
* The @p codec is only valid while in the callback, so the values must be stored by the * The @p codec is only valid while in the callback, so the values must be stored by the
* receiver if future use is wanted. * receiver if future use is wanted.
* *
* @param conn Connection to the remote unicast server. * @param conn Connection to the remote unicast server.
* @param dir The type of remote endpoints and capabilities discovered.
* @param codec Remote capabilities.
*
* If discovery procedure has complete both @p codec and @p ep are set to NULL.
*/
void (*pac_record)(struct bt_conn *conn, enum bt_audio_dir dir,
const struct bt_codec *codec);
/**
* @brief BAP discovery callback function.
*
* If discovery procedure has completed @p ep is set to NULL and @p err is 0.
*
* @param conn Connection to the remote unicast server.
* @param err Error value. 0 on success, GATT error on positive value or errno on * @param err Error value. 0 on success, GATT error on positive value or errno on
* negative value. * negative value.
* @param dir The type of remote endpoints and capabilities discovered. * @param dir The type of remote endpoints and capabilities discovered.
* @param codec Remote capabilities.
* @param ep Remote endpoint. * @param ep Remote endpoint.
* *
* If discovery procedure has complete both @p codec and @p ep are set to NULL. * If discovery procedure has complete both @p codec and @p ep are set to NULL.
*/ */
void (*discover)(struct bt_conn *conn, int err, enum bt_audio_dir dir, void (*discover)(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_codec *codec, struct bt_bap_ep *ep); struct bt_bap_ep *ep);
}; };
/** /**

22
samples/bluetooth/unicast_audio_client/src/main.c
View file

@ -576,7 +576,7 @@ static void add_remote_sink(struct bt_bap_ep *ep)
printk("Could not add sink ep\n"); printk("Could not add sink ep\n");
} }
static void print_remote_codec(struct bt_codec *codec_capabilities, enum bt_audio_dir dir) static void print_remote_codec(const struct bt_codec *codec_capabilities, enum bt_audio_dir dir)
{ {
printk("codec_capabilities %p dir 0x%02x\n", codec_capabilities, dir); printk("codec_capabilities %p dir 0x%02x\n", codec_capabilities, dir);
@ -584,18 +584,13 @@ static void print_remote_codec(struct bt_codec *codec_capabilities, enum bt_audi
} }
static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_codec *codec, struct bt_bap_ep *ep) struct bt_bap_ep *ep)
{ {
if (err != 0 && err != BT_ATT_ERR_ATTRIBUTE_NOT_FOUND) { if (err != 0 && err != BT_ATT_ERR_ATTRIBUTE_NOT_FOUND) {
printk("Discovery failed: %d\n", err); printk("Discovery failed: %d\n", err);
return; return;
} }
if (codec != NULL) {
print_remote_codec(codec, dir);
return;
}
if (ep != NULL) { if (ep != NULL) {
add_remote_sink(ep); add_remote_sink(ep);
@ -612,18 +607,13 @@ static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir d
} }
static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_codec *codec, struct bt_bap_ep *ep) struct bt_bap_ep *ep)
{ {
if (err != 0 && err != BT_ATT_ERR_ATTRIBUTE_NOT_FOUND) { if (err != 0 && err != BT_ATT_ERR_ATTRIBUTE_NOT_FOUND) {
printk("Discovery failed: %d\n", err); printk("Discovery failed: %d\n", err);
return; return;
} }
if (codec != NULL) {
print_remote_codec(codec, dir);
return;
}
if (ep != NULL) { if (ep != NULL) {
add_remote_source(ep); add_remote_source(ep);
@ -721,9 +711,15 @@ static void available_contexts_cb(struct bt_conn *conn,
printk("snk ctx %u src ctx %u\n", snk_ctx, src_ctx); printk("snk ctx %u src ctx %u\n", snk_ctx, src_ctx);
} }
static void pac_record_cb(struct bt_conn *conn, enum bt_audio_dir dir, const struct bt_codec *codec)
{
print_remote_codec(codec, dir);
}
static struct bt_bap_unicast_client_cb unicast_client_cbs = { static struct bt_bap_unicast_client_cb unicast_client_cbs = {
.location = unicast_client_location_cb, .location = unicast_client_location_cb,
.available_contexts = available_contexts_cb, .available_contexts = available_contexts_cb,
.pac_record = pac_record_cb,
}; };
static int init(void) static int init(void)

70
subsys/bluetooth/audio/bap_unicast_client.c
View file

@ -1450,12 +1450,26 @@ static int unicast_client_ep_subscribe(struct bt_conn *conn, struct bt_bap_ep *e
return bt_gatt_subscribe(conn, &client_ep->subscribe); return bt_gatt_subscribe(conn, &client_ep->subscribe);
} }
static void discover_cb(struct bt_conn *conn, int err, struct bt_codec *codec, struct bt_bap_ep *ep) static void pac_record_cb(struct bt_conn *conn, const struct bt_codec *codec)
{
if (unicast_client_cbs != NULL && unicast_client_cbs->pac_record != NULL) {
struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
const enum bt_audio_dir dir = client->dir;
/* TBD: Since the PAC records are optionally notifyable we may want to supply the
* index and total count of records in the callback, so that it easier for the
* upper layers to determine when a new set of PAC records is being reported.
*/
unicast_client_cbs->pac_record(conn, dir, codec);
}
}
static void discover_cb(struct bt_conn *conn, int err, struct bt_bap_ep *ep)
{ {
struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)]; struct unicast_client *client = &uni_cli_insts[bt_conn_index(conn)];
const enum bt_audio_dir dir = client->dir; const enum bt_audio_dir dir = client->dir;
if (err != 0 || (codec == NULL && ep == NULL)) { if (err != 0 || ep == NULL) {
/* Discover complete - Reset discovery values */ /* Discover complete - Reset discovery values */
client->dir = 0U; client->dir = 0U;
client->busy = false; client->busy = false;
@ -1464,7 +1478,7 @@ static void discover_cb(struct bt_conn *conn, int err, struct bt_codec *codec, s
} }
if (unicast_client_cbs != NULL && unicast_client_cbs->discover != NULL) { if (unicast_client_cbs != NULL && unicast_client_cbs->discover != NULL) {
unicast_client_cbs->discover(conn, err, dir, codec, ep); unicast_client_cbs->discover(conn, err, dir, ep);
} }
} }
@ -1474,7 +1488,7 @@ static void unicast_client_cp_sub_cb(struct bt_conn *conn, uint8_t err,
LOG_DBG("conn %p err %u", conn, err); LOG_DBG("conn %p err %u", conn, err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
static void unicast_client_ep_set_cp(struct bt_conn *conn, uint16_t handle) static void unicast_client_ep_set_cp(struct bt_conn *conn, uint16_t handle)
@ -1519,12 +1533,12 @@ static void unicast_client_ep_set_cp(struct bt_conn *conn, uint16_t handle)
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to subscribe: %d", err); LOG_DBG("Failed to subscribe: %d", err);
discover_cb(conn, BT_ATT_ERR_UNLIKELY, NULL, NULL); discover_cb(conn, BT_ATT_ERR_UNLIKELY, NULL);
return; return;
} }
} else { /* already subscribed */ } else { /* already subscribed */
discover_cb(conn, 0, NULL, NULL); discover_cb(conn, 0, NULL);
} }
} }
@ -2836,7 +2850,7 @@ static uint8_t unicast_client_cp_discover_func(struct bt_conn *conn,
if (!attr) { if (!attr) {
LOG_ERR("Unable to find ASE Control Point"); LOG_ERR("Unable to find ASE Control Point");
discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL, NULL); discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -2927,19 +2941,19 @@ static uint8_t unicast_client_ase_read_func(struct bt_conn *conn, uint8_t err,
unicast_client_ep_set_status(ep, buf); unicast_client_ep_set_status(ep, buf);
unicast_client_ep_subscribe(conn, ep); unicast_client_ep_subscribe(conn, ep);
discover_cb(conn, 0, NULL, ep); discover_cb(conn, 0, ep);
err = unicast_client_ase_discover(conn, handle); err = unicast_client_ase_discover(conn, handle);
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read ASE: %d", err); LOG_DBG("Failed to read ASE: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
fail: fail:
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -2957,7 +2971,7 @@ static uint8_t unicast_client_ase_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_ERR("Unable to discover ASE Control Point"); LOG_ERR("Unable to discover ASE Control Point");
discover_cb(conn, BT_ATT_ERR_UNLIKELY, NULL, NULL); discover_cb(conn, BT_ATT_ERR_UNLIKELY, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -2984,7 +2998,7 @@ static uint8_t unicast_client_ase_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read PAC records: %d", err); LOG_DBG("Failed to read PAC records: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3031,7 +3045,7 @@ static uint8_t unicast_client_pacs_avail_ctx_read_func(struct bt_conn *conn, uin
err = BT_ATT_ERR_INVALID_ATTRIBUTE_LEN; err = BT_ATT_ERR_INVALID_ATTRIBUTE_LEN;
} }
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3051,7 +3065,7 @@ static uint8_t unicast_client_pacs_avail_ctx_read_func(struct bt_conn *conn, uin
if (cb_err != 0) { if (cb_err != 0) {
LOG_ERR("Unable to read ASE: %d", cb_err); LOG_ERR("Unable to read ASE: %d", cb_err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3126,7 +3140,7 @@ static uint8_t unicast_client_pacs_avail_ctx_discover_cb(struct bt_conn *conn,
* the characteristic is mandatory * the characteristic is mandatory
*/ */
discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL, NULL); discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3162,7 +3176,7 @@ static uint8_t unicast_client_pacs_avail_ctx_discover_cb(struct bt_conn *conn,
/* If the characteristic is not subscribable we terminate the /* If the characteristic is not subscribable we terminate the
* discovery as BT_GATT_CHRC_NOTIFY is mandatory * discovery as BT_GATT_CHRC_NOTIFY is mandatory
*/ */
discover_cb(conn, BT_ATT_ERR_NOT_SUPPORTED, NULL, NULL); discover_cb(conn, BT_ATT_ERR_NOT_SUPPORTED, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3171,7 +3185,7 @@ static uint8_t unicast_client_pacs_avail_ctx_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read PACS avail_ctx: %d", err); LOG_DBG("Failed to read PACS avail_ctx: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3215,7 +3229,7 @@ static uint8_t unicast_client_pacs_location_read_func(struct bt_conn *conn, uint
err = BT_ATT_ERR_INVALID_ATTRIBUTE_LEN; err = BT_ATT_ERR_INVALID_ATTRIBUTE_LEN;
} }
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3234,7 +3248,7 @@ static uint8_t unicast_client_pacs_location_read_func(struct bt_conn *conn, uint
if (cb_err != 0) { if (cb_err != 0) {
LOG_ERR("Unable to read available contexts: %d", cb_err); LOG_ERR("Unable to read available contexts: %d", cb_err);
discover_cb(conn, cb_err, NULL, NULL); discover_cb(conn, cb_err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3321,7 +3335,7 @@ static uint8_t unicast_client_pacs_location_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_ERR("Unable to read available contexts: %d", err); LOG_ERR("Unable to read available contexts: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3360,7 +3374,7 @@ static uint8_t unicast_client_pacs_location_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read PACS location: %d", err); LOG_DBG("Failed to read PACS location: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3416,7 +3430,7 @@ discover_loc:
if (cb_err != 0) { if (cb_err != 0) {
LOG_ERR("Unable to read PACS location: %d", cb_err); LOG_ERR("Unable to read PACS location: %d", cb_err);
discover_cb(conn, cb_err, NULL, NULL); discover_cb(conn, cb_err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3434,7 +3448,7 @@ static uint8_t unicast_client_pacs_context_discover_cb(struct bt_conn *conn,
if (attr == NULL) { if (attr == NULL) {
LOG_ERR("Unable to find %s PAC context", bt_audio_dir_str(client->dir)); LOG_ERR("Unable to find %s PAC context", bt_audio_dir_str(client->dir));
discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL, NULL); discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3457,7 +3471,7 @@ static uint8_t unicast_client_pacs_context_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read PAC records: %d", err); LOG_DBG("Failed to read PAC records: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
@ -3594,7 +3608,7 @@ static uint8_t unicast_client_read_func(struct bt_conn *conn, uint8_t err,
LOG_DBG("codec 0x%02x config count %u meta count %u ", codec.id, codec.data_count, LOG_DBG("codec 0x%02x config count %u meta count %u ", codec.id, codec.data_count,
codec.meta_count); codec.meta_count);
discover_cb(conn, 0, &codec, NULL); pac_record_cb(conn, &codec);
} }
if (i != rsp->num_pac) { if (i != rsp->num_pac) {
@ -3613,7 +3627,7 @@ static uint8_t unicast_client_read_func(struct bt_conn *conn, uint8_t err,
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
fail: fail:
discover_cb(conn, cb_err, NULL, NULL); discover_cb(conn, cb_err, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3629,7 +3643,7 @@ static uint8_t unicast_client_pac_discover_cb(struct bt_conn *conn,
if (attr == NULL) { if (attr == NULL) {
LOG_ERR("Unable to find %s PAC", bt_audio_dir_str(client->dir)); LOG_ERR("Unable to find %s PAC", bt_audio_dir_str(client->dir));
discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL, NULL); discover_cb(conn, BT_ATT_ERR_ATTRIBUTE_NOT_FOUND, NULL);
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;
} }
@ -3655,7 +3669,7 @@ static uint8_t unicast_client_pac_discover_cb(struct bt_conn *conn,
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to read PAC records: %d", err); LOG_DBG("Failed to read PAC records: %d", err);
discover_cb(conn, err, NULL, NULL); discover_cb(conn, err, NULL);
} }
return BT_GATT_ITER_STOP; return BT_GATT_ITER_STOP;

24
subsys/bluetooth/audio/shell/bap.c
View file

@ -703,7 +703,7 @@ static uint8_t stream_dir(const struct bt_bap_stream *stream)
return 0; return 0;
} }
static void print_remote_codec(const struct bt_conn *conn, struct bt_codec *codec, static void print_remote_codec(const struct bt_conn *conn, const struct bt_codec *codec,
enum bt_audio_dir dir) enum bt_audio_dir dir)
{ {
shell_print(ctx_shell, "conn %p: codec %p dir 0x%02x", conn, codec, dir); shell_print(ctx_shell, "conn %p: codec %p dir 0x%02x", conn, codec, dir);
@ -747,13 +747,13 @@ static void add_source(const struct bt_conn *conn, struct bt_bap_ep *ep)
} }
#endif /* CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT > 0 */ #endif /* CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SRC_COUNT > 0 */
static void discover_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void pac_record_cb(struct bt_conn *conn, enum bt_audio_dir dir, const struct bt_codec *codec)
struct bt_codec *codec, struct bt_bap_ep *ep) {
print_remote_codec(conn, codec, dir);
}
static void discover_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, struct bt_bap_ep *ep)
{ {
if (codec != NULL) {
print_remote_codec(conn, codec, dir);
return;
}
if (ep) { if (ep) {
#if CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0 #if CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0
@ -774,13 +774,8 @@ static void discover_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
shell_print(ctx_shell, "Discover complete: err %d", err); shell_print(ctx_shell, "Discover complete: err %d", err);
} }
static void discover_all(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void discover_all(struct bt_conn *conn, int err, enum bt_audio_dir dir, struct bt_bap_ep *ep)
struct bt_codec *codec, struct bt_bap_ep *ep)
{ {
if (codec != NULL) {
print_remote_codec(conn, codec, dir);
return;
}
if (ep) { if (ep) {
#if CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0 #if CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT > 0
@ -806,7 +801,7 @@ static void discover_all(struct bt_conn *conn, int err, enum bt_audio_dir dir,
err = bt_bap_unicast_client_discover(default_conn, dir); err = bt_bap_unicast_client_discover(default_conn, dir);
if (err) { if (err) {
shell_error(ctx_shell, "bt_bap_unicast_client_discover err %d", err); shell_error(ctx_shell, "bt_bap_unicast_client_discover err %d", err);
discover_cb(conn, err, dir, NULL, NULL); discover_cb(conn, err, dir, NULL);
} }
} }
} }
@ -892,6 +887,7 @@ static struct bt_bap_unicast_client_cb unicast_client_cbs = {
.disable = disable_cb, .disable = disable_cb,
.metadata = metadata_cb, .metadata = metadata_cb,
.release = release_cb, .release = release_cb,
.pac_record = pac_record_cb,
}; };
static int cmd_discover(const struct shell *sh, size_t argc, char *argv[]) static int cmd_discover(const struct shell *sh, size_t argc, char *argv[])

36
tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c
View file

@ -30,6 +30,7 @@ static struct bt_bap_lc3_preset preset_16_2_1 = BT_BAP_LC3_UNICAST_PRESET_16_2_1
CREATE_FLAG(flag_mtu_exchanged); CREATE_FLAG(flag_mtu_exchanged);
CREATE_FLAG(flag_sink_discovered); CREATE_FLAG(flag_sink_discovered);
CREATE_FLAG(flag_source_discovered); CREATE_FLAG(flag_source_discovered);
CREATE_FLAG(flag_codec_found);
CREATE_FLAG(flag_stream_codec_configured); CREATE_FLAG(flag_stream_codec_configured);
static atomic_t flag_stream_qos_configured; static atomic_t flag_stream_qos_configured;
CREATE_FLAG(flag_stream_enabled); CREATE_FLAG(flag_stream_enabled);
@ -224,7 +225,7 @@ static void add_remote_source(struct bt_bap_ep *ep)
FAIL("Could not add source ep\n"); FAIL("Could not add source ep\n");
} }
static void print_remote_codec(struct bt_codec *codec, enum bt_audio_dir dir) static void print_remote_codec(const struct bt_codec *codec, enum bt_audio_dir dir)
{ {
printk("codec %p dir 0x%02x\n", codec, dir); printk("codec %p dir 0x%02x\n", codec, dir);
@ -232,9 +233,8 @@ static void print_remote_codec(struct bt_codec *codec, enum bt_audio_dir dir)
} }
static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_codec *codec, struct bt_bap_ep *ep) struct bt_bap_ep *ep)
{ {
static bool codec_found;
static bool endpoint_found; static bool endpoint_found;
if (err != 0) { if (err != 0) {
@ -242,12 +242,6 @@ static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir d
return; return;
} }
if (codec != NULL) {
print_remote_codec(codec, dir);
codec_found = true;
return;
}
if (ep != NULL) { if (ep != NULL) {
if (dir == BT_AUDIO_DIR_SINK) { if (dir == BT_AUDIO_DIR_SINK) {
add_remote_sink(ep); add_remote_sink(ep);
@ -261,7 +255,7 @@ static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir d
printk("Sinks discover complete\n"); printk("Sinks discover complete\n");
if (endpoint_found && codec_found) { if (endpoint_found) {
SET_FLAG(flag_sink_discovered); SET_FLAG(flag_sink_discovered);
} else { } else {
FAIL("Did not discover endpoint and codec\n"); FAIL("Did not discover endpoint and codec\n");
@ -269,9 +263,8 @@ static void discover_sinks_cb(struct bt_conn *conn, int err, enum bt_audio_dir d
} }
static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_codec *codec, struct bt_bap_ep *ep) struct bt_bap_ep *ep)
{ {
static bool codec_found;
static bool endpoint_found; static bool endpoint_found;
if (err != 0) { if (err != 0) {
@ -279,12 +272,6 @@ static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir
return; return;
} }
if (codec != NULL) {
print_remote_codec(codec, dir);
codec_found = true;
return;
}
if (ep != NULL) { if (ep != NULL) {
if (dir == BT_AUDIO_DIR_SOURCE) { if (dir == BT_AUDIO_DIR_SOURCE) {
add_remote_source(ep); add_remote_source(ep);
@ -298,13 +285,19 @@ static void discover_sources_cb(struct bt_conn *conn, int err, enum bt_audio_dir
printk("Sources discover complete\n"); printk("Sources discover complete\n");
if (endpoint_found && codec_found) { if (endpoint_found) {
SET_FLAG(flag_source_discovered); SET_FLAG(flag_source_discovered);
} else { } else {
FAIL("Did not discover endpoint and codec\n"); FAIL("Did not discover endpoint and codec\n");
} }
} }
static void pac_record_cb(struct bt_conn *conn, enum bt_audio_dir dir, const struct bt_codec *codec)
{
print_remote_codec(codec, dir);
SET_FLAG(flag_codec_found);
}
static struct bt_bap_unicast_client_cb unicast_client_cbs = { static struct bt_bap_unicast_client_cb unicast_client_cbs = {
.location = unicast_client_location_cb, .location = unicast_client_location_cb,
.available_contexts = available_contexts_cb, .available_contexts = available_contexts_cb,
@ -316,6 +309,7 @@ static struct bt_bap_unicast_client_cb unicast_client_cbs = {
.disable = disable_cb, .disable = disable_cb,
.metadata = metadata_cb, .metadata = metadata_cb,
.release = release_cb, .release = release_cb,
.pac_record = pac_record_cb,
}; };
static void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx) static void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx)
@ -376,6 +370,7 @@ static void discover_sinks(void)
unicast_client_cbs.discover = discover_sinks_cb; unicast_client_cbs.discover = discover_sinks_cb;
UNSET_FLAG(flag_codec_found);
UNSET_FLAG(flag_sink_discovered); UNSET_FLAG(flag_sink_discovered);
err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SINK); err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SINK);
@ -386,6 +381,7 @@ static void discover_sinks(void)
memset(g_sinks, 0, sizeof(g_sinks)); memset(g_sinks, 0, sizeof(g_sinks));
WAIT_FOR_FLAG(flag_codec_found);
WAIT_FOR_FLAG(flag_sink_discovered); WAIT_FOR_FLAG(flag_sink_discovered);
} }
@ -395,6 +391,7 @@ static void discover_sources(void)
unicast_client_cbs.discover = discover_sources_cb; unicast_client_cbs.discover = discover_sources_cb;
UNSET_FLAG(flag_codec_found);
UNSET_FLAG(flag_source_discovered); UNSET_FLAG(flag_source_discovered);
err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SOURCE); err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SOURCE);
@ -405,6 +402,7 @@ static void discover_sources(void)
memset(g_sources, 0, sizeof(g_sources)); memset(g_sources, 0, sizeof(g_sources));
WAIT_FOR_FLAG(flag_codec_found);
WAIT_FOR_FLAG(flag_source_discovered); WAIT_FOR_FLAG(flag_source_discovered);
} }

28
tests/bsim/bluetooth/audio/src/cap_initiator_test.c
View file

@ -52,6 +52,7 @@ static K_SEM_DEFINE(sem_broadcast_started, 0U, ARRAY_SIZE(broadcast_streams));
static K_SEM_DEFINE(sem_broadcast_stopped, 0U, ARRAY_SIZE(broadcast_streams)); static K_SEM_DEFINE(sem_broadcast_stopped, 0U, ARRAY_SIZE(broadcast_streams));
CREATE_FLAG(flag_discovered); CREATE_FLAG(flag_discovered);
CREATE_FLAG(flag_codec_found);
CREATE_FLAG(flag_started); CREATE_FLAG(flag_started);
CREATE_FLAG(flag_updated); CREATE_FLAG(flag_updated);
CREATE_FLAG(flag_stopped); CREATE_FLAG(flag_stopped);
@ -255,17 +256,22 @@ static void add_remote_sink(struct bt_bap_ep *ep)
FAIL("Could not add source ep\n"); FAIL("Could not add source ep\n");
} }
static void print_remote_codec(struct bt_codec *codec, enum bt_audio_dir dir) static void print_remote_codec(const struct bt_codec *codec, enum bt_audio_dir dir)
{ {
printk("codec %p dir 0x%02x\n", codec, dir); printk("codec %p dir 0x%02x\n", codec, dir);
print_codec(codec); print_codec(codec);
} }
static void discover_sink_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir, static void pac_record_cb(struct bt_conn *conn, enum bt_audio_dir dir, const struct bt_codec *codec)
struct bt_codec *codec, struct bt_bap_ep *ep) {
print_remote_codec(codec, dir);
SET_FLAG(flag_codec_found);
}
static void discover_sink_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir,
struct bt_bap_ep *ep)
{ {
static bool codec_found;
static bool endpoint_found; static bool endpoint_found;
if (err != 0) { if (err != 0) {
@ -273,13 +279,6 @@ static void discover_sink_cb(struct bt_conn *conn, int err, enum bt_audio_dir di
return; return;
} }
if (codec != NULL) {
print_remote_codec(codec, dir);
codec_found = true;
return;
}
if (ep != NULL) { if (ep != NULL) {
if (dir == BT_AUDIO_DIR_SINK) { if (dir == BT_AUDIO_DIR_SINK) {
add_remote_sink(ep); add_remote_sink(ep);
@ -293,7 +292,7 @@ static void discover_sink_cb(struct bt_conn *conn, int err, enum bt_audio_dir di
printk("Sink discover complete\n"); printk("Sink discover complete\n");
if (endpoint_found && codec_found) { if (endpoint_found) {
SET_FLAG(flag_sink_discovered); SET_FLAG(flag_sink_discovered);
} else { } else {
FAIL("Did not discover endpoint and codec\n"); FAIL("Did not discover endpoint and codec\n");
@ -302,6 +301,7 @@ static void discover_sink_cb(struct bt_conn *conn, int err, enum bt_audio_dir di
static const struct bt_bap_unicast_client_cb unicast_client_cbs = { static const struct bt_bap_unicast_client_cb unicast_client_cbs = {
.discover = discover_sink_cb, .discover = discover_sink_cb,
.pac_record = pac_record_cb,
}; };
static void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx) static void att_mtu_updated(struct bt_conn *conn, uint16_t tx, uint16_t rx)
@ -375,6 +375,9 @@ static void discover_sink(void)
{ {
int err; int err;
UNSET_FLAG(flag_sink_discovered);
UNSET_FLAG(flag_codec_found);
err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SINK); err = bt_bap_unicast_client_discover(default_conn, BT_AUDIO_DIR_SINK);
if (err != 0) { if (err != 0) {
printk("Failed to discover sink: %d\n", err); printk("Failed to discover sink: %d\n", err);
@ -384,6 +387,7 @@ static void discover_sink(void)
memset(unicast_sink_eps, 0, sizeof(unicast_sink_eps)); memset(unicast_sink_eps, 0, sizeof(unicast_sink_eps));
WAIT_FOR_FLAG(flag_sink_discovered); WAIT_FOR_FLAG(flag_sink_discovered);
WAIT_FOR_FLAG(flag_codec_found);
} }
static void discover_cas_inval(void) static void discover_cas_inval(void)