michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: Bluetooth: tester: Fix bt_micp_mic_ctlr_mute_get invalid usage

Browse source 
The call to bt_micp_mic_ctlr_mute_get function will return the value of
mute state in bt_micp_mic_ctlr_cb.mute callback. This fixes invalid
function calls by storing the recent mute state value in the
application.

Fixes: MICP/CL/SPE/BI-01-C
Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2023-10-17 16:35:29 +02:00 • committed by Carles Cufí
commit 281ffe5b4f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/bluetooth/tester/src/btp_micp.c
View file

@ -32,6 +32,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
static struct bt_micp_mic_ctlr *mic_ctlr; static struct bt_micp_mic_ctlr *mic_ctlr;
static struct bt_micp_mic_dev_register_param mic_dev_register_param; static struct bt_micp_mic_dev_register_param mic_dev_register_param;
static uint8_t mute_state;
#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS) #if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
static struct bt_micp_included micp_included; static struct bt_micp_included micp_included;
@ -85,8 +86,10 @@ static void micp_mic_ctlr_mute_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err, ui
{ {
struct bt_conn *conn; struct bt_conn *conn;
mute_state = mute;
bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn); bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn);
btp_send_micp_mute_state_ev(conn, err, mute); btp_send_micp_mute_state_ev(conn, err, mute_state);
LOG_DBG("MICP Mute cb (%d)", err); LOG_DBG("MICP Mute cb (%d)", err);
} }
@ -94,7 +97,6 @@ static void micp_mic_ctlr_mute_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err, ui
static void micp_mic_ctlr_mute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err) static void micp_mic_ctlr_mute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err)
{ {
struct bt_conn *conn; struct bt_conn *conn;
uint8_t mute_state = bt_micp_mic_ctlr_mute_get(mic_ctlr);
bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn); bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn);
btp_send_micp_mute_state_ev(conn, err, mute_state); btp_send_micp_mute_state_ev(conn, err, mute_state);
@ -105,7 +107,6 @@ static void micp_mic_ctlr_mute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int
static void micp_mic_ctlr_unmute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err) static void micp_mic_ctlr_unmute_written_cb(struct bt_micp_mic_ctlr *mic_ctlr, int err)
{ {
struct bt_conn *conn; struct bt_conn *conn;
uint8_t mute_state = bt_micp_mic_ctlr_mute_get(mic_ctlr);
bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn); bt_micp_mic_ctlr_conn_get(mic_ctlr, &conn);
btp_send_micp_mute_state_ev(conn, err, mute_state); btp_send_micp_mute_state_ev(conn, err, mute_state);