michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CAP: Add reference to the set member for CAP discover

Browse source 
Since the CSIP API expects a set member struct for nearly all
functionality, the reference to the full set member (along with
the CAS specific CSIS) should be given to the application.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-05-15 14:08:48 +02:00 • committed by Johan Hedberg
commit f58ac3476f
17 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/bluetooth/audio/mocks/include/cap_commander.h
View file

@ -16,6 +16,7 @@ void mock_cap_commander_init(void);
void mock_cap_commander_cleanup(void);
DECLARE_FAKE_VOID_FUNC(mock_cap_commander_discovery_complete_cb, struct bt_conn *, int,
const struct bt_csip_set_coordinator_set_member *,
const struct bt_csip_set_coordinator_csis_inst *);
DECLARE_FAKE_VOID_FUNC(mock_cap_commander_volume_changed_cb, struct bt_conn *, int);
DECLARE_FAKE_VOID_FUNC(mock_cap_commander_volume_mute_changed_cb, struct bt_conn *, int);

1
tests/bluetooth/audio/mocks/src/cap_commander.c
View file

@ -18,6 +18,7 @@
FAKE(mock_cap_commander_microphone_gain_changed_cb)
DEFINE_FAKE_VOID_FUNC(mock_cap_commander_discovery_complete_cb, struct bt_conn *, int,
const struct bt_csip_set_coordinator_set_member *,
const struct bt_csip_set_coordinator_csis_inst *);
DEFINE_FAKE_VOID_FUNC(mock_cap_commander_volume_changed_cb, struct bt_conn *, int);

1
tests/bluetooth/tester/src/btp_cap.c
View file

@ -50,6 +50,7 @@ static void btp_send_discovery_completed_ev(struct bt_conn *conn, uint8_t status
}
static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
const struct bt_csip_set_coordinator_set_member *member,
const struct bt_csip_set_coordinator_csis_inst *csis_inst)
{
LOG_DBG("");

1
tests/bsim/bluetooth/audio/src/cap_commander_test.c
View file

@ -36,6 +36,7 @@ CREATE_FLAG(flag_microphone_mute_changed);
CREATE_FLAG(flag_microphone_gain_changed);
static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
const struct bt_csip_set_coordinator_set_member *member,
const struct bt_csip_set_coordinator_csis_inst *csis_inst)
{
if (err != 0) {

1
tests/bsim/bluetooth/audio/src/cap_initiator_unicast_test.c
View file

@ -185,6 +185,7 @@ static struct bt_bap_stream_ops unicast_stream_ops = {
};
static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
const struct bt_csip_set_coordinator_set_member *member,
const struct bt_csip_set_coordinator_csis_inst *csis_inst)
{
if (err != 0) {

1
tests/bsim/bluetooth/audio/src/gmap_ugg_test.c
View file

@ -263,6 +263,7 @@ static struct bt_bap_stream_ops stream_ops = {
};
static void cap_discovery_complete_cb(struct bt_conn *conn, int err,
const struct bt_csip_set_coordinator_set_member *member,
const struct bt_csip_set_coordinator_csis_inst *csis_inst)
{
if (err != 0) {