michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CSIS: Merge the two client discovery functions

Browse source 
Merges bt_csis_client_discover and
bt_csis_client_discover_sets, as they should be done
together for the discovery procedure from the CSIP
spec.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-12-16 12:02:34 +01:00 • committed by Anas Nashif
commit ffd4fd571a
4 changed files with 52 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/bluetooth/audio/csis.h
View file

@ -222,7 +222,7 @@ struct bt_csis_client_set_info {
* @brief Struct representing a coordinated set instance on a remote device
*
* The values in this struct will be populated during discovery of sets
* (bt_csis_client_discover_sets()).
* (bt_csis_client_discover()).
*/
struct bt_csis_client_csis_inst {
struct bt_csis_client_set_info info;
@ -260,27 +260,6 @@ typedef void (*bt_csis_client_discover_cb)(struct bt_csis_client_set_member *mem
*/
int bt_csis_client_discover(struct bt_csis_client_set_member *member);
/**
* @typedef bt_csis_client_discover_sets_cb
* @brief Callback for discovering sets and their content.
*
* @param member Pointer to the set member.
* @param err 0 on success, or an errno value on error.
* @param set_count Number of sets on the member.
*/
typedef void (*bt_csis_client_discover_sets_cb)(struct bt_csis_client_set_member *member,
int err, uint8_t set_count);
/**
* @brief Reads CSIS characteristics from a device, to find more information
* about the set(s) that the device is part of.
*
* @param member Pointer to a set member struct to store discovery results in.
*
* @return int Return 0 on success, or an errno value on error.
*/
int bt_csis_client_discover_sets(struct bt_csis_client_set_member *member);
/**
* @typedef bt_csis_client_lock_set_cb
* @brief Callback for locking a set across one or more devices
@ -322,7 +301,6 @@ struct bt_csis_client_cb {
/* Set callbacks */
bt_csis_client_lock_set_cb lock_set;
bt_csis_client_lock_set_cb release_set;
bt_csis_client_discover_sets_cb sets;
bt_csis_client_lock_changed_cb lock_changed;
/* Device specific callbacks */