michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CSIS: Rename bt_csis_client_set

Browse source 
Rename struct bt_csis_client_set to
struct bt_csis_client_csis_inst, as that is more descriptive
of the actual content of the struct.

This also avoids the confusion about what a "set" is,
which is clearly not a single instance of CSIS
on a single remote server.

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

28
tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c
View file

@ -18,7 +18,7 @@ static volatile bool set_locked;
static volatile bool set_unlocked;
static volatile bool set_read_locked;
static volatile bool set_read_unlocked;
static struct bt_csis_client_set *set;
static struct bt_csis_client_csis_inst *inst;
static uint8_t members_found;
static struct k_work_delayable discover_members_timer;
@ -62,7 +62,7 @@ static void csis_client_discover_sets_cb(struct bt_csis_client_set_member *membe
return;
}
set = &member->sets[0];
inst = &member->insts[0];
sets_discovered = true;
}
@ -79,10 +79,10 @@ static void csis_discover_cb(struct bt_csis_client_set_member *member, int err,
discovered = true;
}
static void csis_lock_changed_cb(struct bt_csis_client_set *set,
static void csis_lock_changed_cb(struct bt_csis_client_csis_inst *inst,
bool locked)
{
printk("Set %p %s\n", set, locked ? "locked" : "released");
printk("Inst %p %s\n", inst, locked ? "locked" : "released");
}
@ -147,7 +147,7 @@ static bool is_discovered(const bt_addr_le_t *addr)
static bool csis_found(struct bt_data *data, void *user_data)
{
if (bt_csis_client_is_set_member(set->info.set_sirk, data)) {
if (bt_csis_client_is_set_member(inst->info.set_sirk, data)) {
const bt_addr_le_t *addr = user_data;
char addr_str[BT_ADDR_LE_STR_LEN];
@ -163,7 +163,7 @@ static bool csis_found(struct bt_data *data, void *user_data)
bt_addr_le_copy(&addr_found[members_found++], addr);
printk("Found member (%u / %u)\n",
members_found, set->info.set_size);
members_found, inst->info.set_size);
/* Stop parsing */
return false;
@ -177,7 +177,7 @@ static void csis_client_scan_recv(const struct bt_le_scan_recv_info *info,
{
/* We're only interested in connectable events */
if (info->adv_props & BT_GAP_ADV_PROP_CONNECTABLE) {
if (set == NULL) {
if (inst == NULL) {
/* Scanning for the first device */
if (members_found == 0) {
bt_addr_le_copy(&addr_found[members_found++],
@ -196,7 +196,7 @@ static struct bt_le_scan_cb csis_client_scan_callbacks = {
static void discover_members_timer_handler(struct k_work *work)
{
FAIL("Could not find all members (%u / %u)\n",
members_found, set->info.set_size);
members_found, inst->info.set_size);
}
static void read_set_lock_state(const struct bt_csis_client_set_member **members,
@ -213,7 +213,7 @@ static void read_set_lock_state(const struct bt_csis_client_set_member **members
set_read_unlocked = false;
}
err = bt_csis_client_get_lock_state(members, count, &set->info);
err = bt_csis_client_get_lock_state(members, count, &inst->info);
if (err != 0) {
FAIL("Failed to do CSIS client read lock state (%d)", err);
return;
@ -306,7 +306,7 @@ static void test_main(void)
return;
}
WAIT_FOR(members_found == set->info.set_size);
WAIT_FOR(members_found == inst->info.set_size);
(void)k_work_cancel_delayable(&discover_members_timer);
err = bt_le_scan_stop();
@ -363,7 +363,7 @@ static void test_main(void)
printk("Locking set\n");
err = bt_csis_client_lock(locked_members, connected_member_count,
&set->info);
&inst->info);
if (err != 0) {
FAIL("Failed to do CSIS client lock (%d)", err);
return;
@ -377,7 +377,7 @@ static void test_main(void)
printk("Releasing set\n");
err = bt_csis_client_release(locked_members, connected_member_count,
&set->info);
&inst->info);
if (err != 0) {
FAIL("Failed to do CSIS client release (%d)", err);
return;
@ -393,7 +393,7 @@ static void test_main(void)
printk("Locking set\n");
err = bt_csis_client_lock(locked_members, connected_member_count,
&set->info);
&inst->info);
if (err != 0) {
FAIL("Failed to do CSIS client lock (%d)", err);
return;
@ -405,7 +405,7 @@ static void test_main(void)
printk("Releasing set\n");
err = bt_csis_client_release(locked_members, connected_member_count,
&set->info);
&inst->info);
if (err != 0) {
FAIL("Failed to do CSIS client release (%d)", err);
return;