Skip to content

Cherry pick pts related fixes #2599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 11, 2025
Merged

Cherry pick pts related fixes #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5bf497
[nrf fromtree] bluetooth: tester: btp: refactors OOB legacy selection
kedMertens Feb 7, 2025
e19fded
[nrf fromtree] bluetooth: tester: btp: refactors privacy selection
kedMertens Feb 7, 2025
346b6f3
[nrf fromtree] bluetooth: tester: btp: fixes ext adv selection
kedMertens Feb 10, 2025
d1b1be8
[nrf fromtree] bluetooth: tester: btp: refactors LE secure pairing se…
kedMertens Feb 10, 2025
b4d8497
[nrf fromtree] bluetooth: tester: btp: refactors periodic adv selection
kedMertens Feb 10, 2025
0ac54b6
[nrf fromtree] tests: bluetooth: tester: Fix invalid checks in oob_da…
sjanc Feb 24, 2025
e9f0119
[nrf fromtree] tests: bluetooth: tester: Make brcst_source_stop synch…
alexsven Mar 4, 2025
87da191
[nrf fromtree] tests: bluetooth: tester: Implement BAP/BSRC/SCC/BV-38-C
gWacey Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions tests/bluetooth/tester/hci_ipc_cpunet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions tests/bluetooth/tester/overlay-le-audio.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions tests/bluetooth/tester/src/audio/btp/btp_bap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 9 additions & 2 deletions tests/bluetooth/tester/src/audio/btp_bap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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)
Expand Down
Loading