[nrf fromtree] tests: bluetooth: tester: Implement BAP/BSRC/SCC/BV-38-C

 - Make ext_adv and per_adv into arrays for multiple BIGs
 - Create bap_broadcast-source_setup_v2 command
  - Handles broadcast_id as an input

Signed-off-by: Graham Wacey <[email protected]>
Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit fb620ef)
Signed-off-by: Alexander Svensen <[email protected]>

Author: gWacey

tests/bluetooth/tester/hci_ipc_cpunet.conf

@@ -6,3 +6,13 @@ CONFIG_BT_MAX_CONN=3
 # PTS tests specific tweaks
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
+
+CONFIG_BT_ISO_MAX_BIG=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+
+CONFIG_BT_CTLR_ADV_ISO_SET=2
+CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
+CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
+
+CONFIG_BT_CTLR_ISOAL_SOURCES=4
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=8

tests/bluetooth/tester/overlay-le-audio.conf

@@ -11,6 +11,7 @@ CONFIG_BT_ISO_BROADCASTER=y
 CONFIG_BT_PER_ADV_SYNC=y
 CONFIG_BT_ISO_SYNC_RECEIVER=y
 CONFIG_BT_EXT_ADV=y
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 CONFIG_BT_BAP_UNICAST_SERVER=y
 CONFIG_BT_BAP_UNICAST_CLIENT=y
 CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT=2
@@ -48,10 +49,12 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1
 
 # Broadcast Source
 CONFIG_BT_BAP_BROADCAST_SOURCE=y
+CONFIG_BT_BAP_BROADCAST_SRC_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
 CONFIG_BT_BAP_BROADCAST_ASSISTANT=y
+CONFIG_BT_ISO_MAX_BIG=2
 
 # Broadcast Sink
 CONFIG_BT_BAP_SCAN_DELEGATOR=y

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

@@ -176,6 +176,27 @@ struct btp_bap_send_past_cmd {
 	uint8_t src_id;
 } __packed;
 
+#define BTP_BAP_BROADCAST_SOURCE_SETUP_V2	0x19
+struct btp_bap_broadcast_source_setup_v2_cmd {
+	uint8_t broadcast_id[BT_AUDIO_BROADCAST_ID_SIZE];
+	uint8_t streams_per_subgroup;
+	uint8_t subgroups;
+	uint8_t sdu_interval[3];
+	uint8_t framing;
+	uint16_t max_sdu;
+	uint8_t retransmission_num;
+	uint16_t max_transport_latency;
+	uint8_t presentation_delay[3];
+	uint8_t coding_format;
+	uint16_t vid;
+	uint16_t cid;
+	uint8_t cc_ltvs_len;
+	uint8_t cc_ltvs[];
+} __packed;
+struct btp_bap_broadcast_source_setup_v2_rp {
+	uint32_t gap_settings;
+} __packed;
+
 /* BAP events */
 #define BTP_BAP_EV_DISCOVERY_COMPLETED		0x80
 struct btp_bap_discovery_completed_ev {

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

@@ -332,6 +332,8 @@ static uint8_t btp_bap_supported_commands(const void *cmd, uint16_t cmd_len,
 
 	/* octet 0 */
 	tester_set_bit(rp->data, BTP_BAP_READ_SUPPORTED_COMMANDS);
+	tester_set_bit(rp->data, BTP_BAP_DISCOVER);
+	tester_set_bit(rp->data, BTP_BAP_SEND);
 
 	*rsp_len = sizeof(*rp) + 1;
 
@@ -369,12 +371,17 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_audio_stream_send,
 	},
-#if defined(CONFIG_BT_BAP_BROADCAST_SINK) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
+#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE) || defined(CONFIG_BT_BAP_BROADCAST_SINK)
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP,
 		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
 		.func = btp_bap_broadcast_source_setup,
 	},
+	{
+		.opcode = BTP_BAP_BROADCAST_SOURCE_SETUP_V2,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
+		.func = btp_bap_broadcast_source_setup_v2,
+	},
 	{
 		.opcode = BTP_BAP_BROADCAST_SOURCE_RELEASE,
 		.expect_len = sizeof(struct btp_bap_broadcast_source_release_cmd),
@@ -475,7 +482,7 @@ static const struct btp_handler bap_handlers[] = {
 		.expect_len = sizeof(struct btp_bap_send_past_cmd),
 		.func = btp_bap_broadcast_assistant_send_past,
 	},
-#endif /* CONFIG_BT_BAP_BROADCAST_SINK || CONFIG_BT_BAP_BROADCAST_SINK */
+#endif /* CONFIG_BT_BAP_BROADCAST_SOURCE || CONFIG_BT_BAP_BROADCAST_SINK */
 };
 
 uint8_t tester_init_pacs(void)