[fromtree] tests: bluetooth: tester: Fix VCS tests

Zephyr automatically sets the persisted flag for VCS if the volume is
changed after the service is registered. As some of these PTS tests
require a set volume with the flag cleared, the initial volume needs to
be set before registering VCS.

(cherry picked from commit 48f82d1)

Signed-off-by: Frode van der Meeren <[email protected]>

Author: Frodevan

tests/bluetooth/tester/src/audio/btp/btp_vcs.h

@@ -8,6 +8,8 @@
 
 #include <stdint.h>
 
+#define BTP_VCS_REGISTER_FLAG_MUTED		BIT(0)
+
 #define BTP_VCS_READ_SUPPORTED_COMMANDS		0x01
 struct btp_vcs_read_supported_commands_rp {
 	uint8_t data[0];
@@ -22,3 +24,10 @@ struct btp_vcs_set_vol_cmd {
 #define BTP_VCS_VOL_DOWN			0x04
 #define BTP_VCS_MUTE				0x05
 #define BTP_VCS_UNMUTE				0x06
+
+#define BTP_VCS_REGISTER			0x07
+struct btp_vcs_register_cmd {
+	uint8_t step;
+	uint8_t flags;
+	uint8_t volume;
+} __packed;

tests/bluetooth/tester/src/audio/btp_vcp.c

@@ -140,6 +140,43 @@ static uint8_t unmute(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_SUCCESS;
 }
 
+static void set_register_params(uint8_t gain_mode, uint8_t step,
+				bool muted, uint8_t volume);
+
+static uint8_t register_vcs(const void *cmd, uint16_t cmd_len,
+			     void *rsp, uint16_t *rsp_len)
+{
+	static bool vcs_registered_flag;
+	const struct btp_vcs_register_cmd *cp = cmd;
+	int err;
+
+	LOG_DBG("Registering VCS");
+
+	if (vcs_registered_flag) {
+		return BTP_STATUS_FAILED;
+	}
+
+	bool muted = (cp->flags & BTP_VCS_REGISTER_FLAG_MUTED) != 0;
+
+	set_register_params(BT_AICS_MODE_MANUAL, cp->step, muted, cp->volume);
+
+	err = bt_vcp_vol_rend_register(&vcp_register_param);
+	if (err != 0) {
+		return BTP_STATUS_FAILED;
+	}
+
+	err = bt_vcp_vol_rend_included_get(&included);
+	if (err != 0) {
+		return BTP_STATUS_FAILED;
+	}
+
+	aics_server_instance.aics_cnt = included.aics_cnt;
+	aics_server_instance.aics = included.aics;
+	vcs_registered_flag = true;
+
+	return BTP_STATUS_SUCCESS;
+}
+
 static void vcs_state_cb(struct bt_conn *conn, int err, uint8_t volume, uint8_t mute)
 {
 	LOG_DBG("VCP state cb err (%d)", err);
@@ -187,6 +224,11 @@ static const struct btp_handler vcs_handlers[] = {
 		.expect_len = 0,
 		.func = unmute,
 	},
+	{
+		.opcode = BTP_VCS_REGISTER,
+		.expect_len = sizeof(struct btp_vcs_register_cmd),
+		.func = register_vcs,
+	},
 };
 
 /* Volume Offset Control Service */
@@ -463,7 +505,8 @@ struct bt_aics_cb aics_server_cb = {
 };
 
 /* General profile handling */
-static void set_register_params(uint8_t gain_mode)
+static void set_register_params(uint8_t gain_mode, uint8_t step,
+				bool muted, uint8_t volume)
 {
 	char input_desc[CONFIG_BT_VCP_VOL_REND_AICS_INSTANCE_COUNT]
 		       [BT_AICS_MAX_INPUT_DESCRIPTION_SIZE];
@@ -495,31 +538,18 @@ static void set_register_params(uint8_t gain_mode)
 		vcp_register_param.aics_param[i].cb = &aics_server_cb;
 	}
 
-	vcp_register_param.step = 1;
-	vcp_register_param.mute = BT_VCP_STATE_UNMUTED;
-	vcp_register_param.volume = 100;
+	vcp_register_param.step = step;
+	if (muted) {
+		vcp_register_param.mute = BT_VCP_STATE_MUTED;
+	} else {
+		vcp_register_param.mute = BT_VCP_STATE_UNMUTED;
+	}
+	vcp_register_param.volume = volume;
 	vcp_register_param.cb = &vcs_cb;
 }
 
 uint8_t tester_init_vcs(void)
 {
-	int err;
-
-	set_register_params(BT_AICS_MODE_MANUAL);
-
-	err = bt_vcp_vol_rend_register(&vcp_register_param);
-	if (err) {
-		return BTP_STATUS_FAILED;
-	}
-
-	err = bt_vcp_vol_rend_included_get(&included);
-	if (err) {
-		return BTP_STATUS_FAILED;
-	}
-
-	aics_server_instance.aics_cnt = included.aics_cnt;
-	aics_server_instance.aics = included.aics;
-
 	tester_register_command_handlers(BTP_SERVICE_ID_VCS, vcs_handlers,
 					 ARRAY_SIZE(vcs_handlers));
 

tests/bsim/bluetooth/tester/src/audio/vcp_peripheral.c

@@ -35,6 +35,7 @@ static void test_vcp_peripheral(void)
 	bsim_btp_core_register(BTP_SERVICE_ID_AICS);
 
 	bsim_btp_gap_set_discoverable(BTP_GAP_GENERAL_DISCOVERABLE);
+	bsim_btp_vcs_register(1U, 0U, 100U);
 	bsim_btp_gap_start_advertising(0U, 0U, NULL, BT_HCI_OWN_ADDR_PUBLIC);
 	bsim_btp_wait_for_gap_device_connected(&remote_addr);
 	bt_addr_le_to_str(&remote_addr, addr_str, sizeof(addr_str));

tests/bsim/bluetooth/tester/src/bsim_btp.c

@@ -873,6 +873,8 @@ static bool is_valid_vcs_packet_len(const struct btp_hdr *hdr, struct net_buf_si
 		return buf_simple->len == 0U;
 	case BTP_VCS_UNMUTE:
 		return buf_simple->len == 0U;
+	case BTP_VCS_REGISTER:
+		return buf_simple->len == 0U;
 
 	/* no events */
 	default:

tests/bsim/bluetooth/tester/src/bsim_btp.h

@@ -563,6 +563,27 @@ static inline void bsim_btp_wait_for_tmap_discovery_complete(void)
 	net_buf_unref(buf);
 }
 
+static inline void bsim_btp_vcs_register(uint8_t step, uint8_t flags, uint8_t vol)
+{
+	struct btp_vcs_register_cmd *cmd;
+	struct btp_hdr *cmd_hdr;
+
+	NET_BUF_SIMPLE_DEFINE(cmd_buffer, BTP_MTU);
+
+	cmd_hdr = net_buf_simple_add(&cmd_buffer, sizeof(*cmd_hdr));
+	cmd_hdr->service = BTP_SERVICE_ID_VCS;
+	cmd_hdr->opcode = BTP_VCS_REGISTER;
+	cmd_hdr->index = BTP_INDEX;
+	cmd = net_buf_simple_add(&cmd_buffer, sizeof(*cmd));
+	cmd->step = step;
+	cmd->flags = flags;
+	cmd->volume = vol;
+
+	cmd_hdr->len = sys_cpu_to_le16(cmd_buffer.len - sizeof(*cmd_hdr));
+
+	bsim_btp_send_to_tester(cmd_buffer.data, cmd_buffer.len);
+}
+
 static inline void bsim_btp_vcp_discover(const bt_addr_le_t *address)
 {
 	struct btp_vcp_discover_cmd *cmd;