michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CSIS: Remove conn from bt_csis_client_lock_changed_cb

Browse source 
The connection pointer can be inferred based on the
set pointer, by using e.g. CONTAINER_OF.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-11-23 14:51:13 +01:00 • committed by Anas Nashif
commit 061fb633a5
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,14 +242,12 @@ typedef void (*bt_csis_client_lock_set_cb)(int err);
/** /**
* @brief Callback when the lock value on a set of a connected device changes. * @brief Callback when the lock value on a set of a connected device changes.
* *
* @param conn Connection of the CSIS server.
* @param set The set that was changed. * @param set The set that was changed.
* @param locked Whether the lock is locked or release. * @param locked Whether the lock is locked or release.
* *
* @return int Return 0 on success, or an errno value on error. * @return int Return 0 on success, or an errno value on error.
*/ */
typedef void (*bt_csis_client_lock_changed_cb)(struct bt_conn *conn, typedef void (*bt_csis_client_lock_changed_cb)(struct bt_csis_client_set *set,
struct bt_csis_client_set *set,
bool locked); bool locked);
/** /**

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

@ -321,7 +321,7 @@ static uint8_t lock_notify_func(struct bt_conn *conn,
client = &client_insts[bt_conn_index(conn)]; client = &client_insts[bt_conn_index(conn)];
set = &client->set_member->sets[csis_inst->cli.idx]; set = &client->set_member->sets[csis_inst->cli.idx];
csis_client_cbs->lock_changed(conn, set, locked); csis_client_cbs->lock_changed(set, locked);
} }
} else { } else {
BT_DBG("Invalid length %u", length); BT_DBG("Invalid length %u", length);

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

@ -75,8 +75,7 @@ static void csis_discover_cb(struct bt_csis_client_set_member *member, int err,
discovered = true; discovered = true;
} }
static void csis_lock_changed_cb(struct bt_conn *conn, static void csis_lock_changed_cb(struct bt_csis_client_set *set,
struct bt_csis_client_set *set,
bool locked) bool locked)
{ {
printk("Set %p %s\n", set, locked ? "locked" : "released"); printk("Set %p %s\n", set, locked ? "locked" : "released");