michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CSIP: Make set_member_by_conn a public function

Browse source 
The function is useful for application to lookup set
members from bt_conn pointers, e.g. when iterating on
connected devices.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-05-29 10:07:53 +02:00 • committed by Henrik Brix Andersen
commit f93b9dee5c
5 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/zephyr/bluetooth/audio/csip.h
View file

@ -314,6 +314,21 @@ typedef void (*bt_csip_set_coordinator_discover_cb)(
*/
int bt_csip_set_coordinator_discover(struct bt_conn *conn);
/**
* @brief Get the set member from a connection pointer
*
* Get the Coordinated Set Identification Profile Set Coordinator pointer from a connection pointer.
* Only Set Coordinators that have been initiated via bt_csip_set_coordinator_discover() can be
* retrieved.
*
* @param conn Connection pointer.
*
* @retval Pointer to a Coordinated Set Identification Profile Set Coordinator instance
* @retval NULL if @p conn is NULL or if the connection has not done discovery yet
*/
struct bt_csip_set_coordinator_set_member *
bt_csip_set_coordinator_set_member_by_conn(const struct bt_conn *conn);
/**
* @typedef bt_csip_set_coordinator_lock_set_cb
* @brief Callback for locking a set across one or more devices

2
subsys/bluetooth/audio/cap_common.c
View file

@ -345,7 +345,7 @@ static uint8_t bt_cap_common_discover_included_cb(struct bt_conn *conn,
}
} else {
const struct bt_csip_set_coordinator_set_member *member =
bt_csip_set_coordinator_csis_member_by_conn(conn);
bt_csip_set_coordinator_set_member_by_conn(conn);
LOG_DBG("Found CAS with CSIS");

6
subsys/bluetooth/audio/csip_internal.h
View file

@ -46,7 +46,5 @@ struct bt_csip_set_coordinator_svc_inst {
struct bt_csip_set_coordinator_set_info *set_info;
};
struct bt_csip_set_coordinator_csis_inst *bt_csip_set_coordinator_csis_inst_by_handle(
struct bt_conn *conn, uint16_t start_handle);
struct bt_csip_set_coordinator_set_member *
bt_csip_set_coordinator_csis_member_by_conn(struct bt_conn *conn);
struct bt_csip_set_coordinator_csis_inst *
bt_csip_set_coordinator_csis_inst_by_handle(struct bt_conn *conn, uint16_t start_handle);

7
subsys/bluetooth/audio/csip_set_coordinator.c
View file

@ -1412,7 +1412,7 @@ struct bt_csip_set_coordinator_csis_inst *bt_csip_set_coordinator_csis_inst_by_h
}
struct bt_csip_set_coordinator_set_member *
bt_csip_set_coordinator_csis_member_by_conn(struct bt_conn *conn)
bt_csip_set_coordinator_set_member_by_conn(const struct bt_conn *conn)
{
struct bt_csip_set_coordinator_inst *client;
@ -1423,8 +1423,11 @@ bt_csip_set_coordinator_csis_member_by_conn(struct bt_conn *conn)
}
client = &client_insts[bt_conn_index(conn)];
if (client->conn == conn) {
return &client->set_member;
}
return &client->set_member;
return NULL;
}
/*************************** PUBLIC FUNCTIONS ***************************/

2
tests/bluetooth/audio/cap_commander/uut/csip.c
View file

@ -53,7 +53,7 @@ int bt_csip_set_coordinator_discover(struct bt_conn *conn)
}
struct bt_csip_set_coordinator_set_member *
bt_csip_set_coordinator_csis_member_by_conn(struct bt_conn *conn)
bt_csip_set_coordinator_set_member_by_conn(const struct bt_conn *conn)
{
if (conn == NULL) {
return NULL;