michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Remove BT_AUDIO_BROADCAST_CODE_SIZE

Browse source 
Removed the LE Audio specific definition and instead
refer to the value defined by iso.h as it is ISO/Core
that defines this size, and not BAP/Audio.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-10-22 13:15:32 +02:00 • committed by David Leach
commit 1dd59ea203
25 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/bluetooth/tester/src/audio/btp/btp_bap.h
View file

@ -167,7 +167,7 @@ struct btp_bap_modify_broadcast_src_cmd {
struct btp_bap_set_broadcast_code_cmd {
bt_addr_le_t address;
uint8_t src_id;
uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
} __packed;
#define BTP_BAP_SEND_PAST 0x18

2
tests/bluetooth/tester/src/audio/btp/btp_cap.h
View file

@ -97,7 +97,7 @@ struct btp_cap_broadcast_source_setup_cmd {
uint16_t max_transport_latency;
uint8_t presentation_delay[3];
uint8_t flags;
uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
} __packed;
struct btp_cap_broadcast_source_setup_rp {
uint8_t source_id;

5
tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
View file

@ -939,7 +939,7 @@ static int pa_sync_term_req_cb(struct bt_conn *conn,
static void broadcast_code_cb(struct bt_conn *conn,
const struct bt_bap_scan_delegator_recv_state *recv_state,
const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
int err;
uint32_t index_bitfield;
@ -955,8 +955,7 @@ static void broadcast_code_cb(struct bt_conn *conn,
}
broadcaster->sink_recv_state = recv_state;
(void)memcpy(broadcaster->sink_broadcast_code, broadcast_code,
BT_AUDIO_BROADCAST_CODE_SIZE);
(void)memcpy(broadcaster->sink_broadcast_code, broadcast_code, BT_ISO_BROADCAST_CODE_SIZE);
if (!broadcaster->requested_bis_sync) {
return;

2
tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
View file

@ -36,7 +36,7 @@ struct btp_bap_broadcast_remote_source {
/* BIS Index bitfield read from sync request */
uint32_t requested_bis_sync;
bool assistant_request;
uint8_t sink_broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
uint8_t sink_broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
const struct bt_bap_scan_delegator_recv_state *sink_recv_state;
};

11
tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c
View file

@ -116,7 +116,7 @@ static void bap_broadcast_assistant_recv_state_cb(
const struct bt_bap_scan_delegator_recv_state *state)
{
char le_addr[BT_ADDR_LE_STR_LEN];
char bad_code[BT_AUDIO_BROADCAST_CODE_SIZE * 2 + 1];
char bad_code[BT_ISO_BROADCAST_CODE_SIZE * 2 + 1];
if (err != 0) {
FAIL("BASS recv state read failed (%d)\n", err);
@ -131,8 +131,7 @@ static void bap_broadcast_assistant_recv_state_cb(
}
bt_addr_le_to_str(&state->addr, le_addr, sizeof(le_addr));
(void)bin2hex(state->bad_code, BT_AUDIO_BROADCAST_CODE_SIZE, bad_code,
sizeof(bad_code));
(void)bin2hex(state->bad_code, BT_ISO_BROADCAST_CODE_SIZE, bad_code, sizeof(bad_code));
printk("BASS recv state: src_id %u, addr %s, sid %u, sync_state %u, encrypt_state %u%s%s\n",
state->src_id, le_addr, state->adv_sid, state->pa_sync_state, state->encrypt_state,
state->encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE ? ", bad code: " : "",
@ -142,8 +141,8 @@ static void bap_broadcast_assistant_recv_state_cb(
SET_FLAG(flag_broadcast_code_requested);
} else if (state->encrypt_state == BT_BAP_BIG_ENC_STATE_BAD_CODE) {
SET_FLAG(flag_incorrect_broadcast_code);
if (memcmp(state->bad_code, INCORRECT_BROADCAST_CODE,
BT_AUDIO_BROADCAST_CODE_SIZE) != 0) {
if (memcmp(state->bad_code, INCORRECT_BROADCAST_CODE, BT_ISO_BROADCAST_CODE_SIZE) !=
0) {
FAIL("Bad code is not what we sent");
return;
}
@ -518,7 +517,7 @@ static void test_bass_mod_source_long_meta(void)
printk("Server PA synced\n");
}
static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
static void test_bass_broadcast_code(const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
int err;

8
tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c
View file

@ -59,7 +59,7 @@ static struct bt_bap_stream *streams[ARRAY_SIZE(broadcast_sink_streams)];
static uint32_t requested_bis_sync;
static struct bt_le_ext_adv *ext_adv;
static const struct bt_bap_scan_delegator_recv_state *req_recv_state;
static uint8_t recv_state_broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
static uint8_t recv_state_broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
#define SUPPORTED_CHAN_COUNTS BT_AUDIO_CODEC_CAP_CHAN_COUNT_SUPPORT(1, 2)
#define SUPPORTED_MIN_OCTETS_PER_FRAME 30
@ -403,11 +403,11 @@ static int bis_sync_req_cb(struct bt_conn *conn,
static void broadcast_code_cb(struct bt_conn *conn,
const struct bt_bap_scan_delegator_recv_state *recv_state,
const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
req_recv_state = recv_state;
memcpy(recv_state_broadcast_code, broadcast_code, BT_AUDIO_BROADCAST_CODE_SIZE);
memcpy(recv_state_broadcast_code, broadcast_code, BT_ISO_BROADCAST_CODE_SIZE);
}
static void scanning_state_cb(struct bt_conn *conn, bool is_scanning)
@ -775,7 +775,7 @@ static void test_broadcast_sink_create_inval(void)
}
}
static void test_broadcast_sync(const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
static void test_broadcast_sync(const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
int err;

6
tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c
View file

@ -48,7 +48,7 @@ struct sync_state {
bool pa_syncing;
struct k_work_delayable pa_timer;
struct bt_le_per_adv_sync *pa_sync;
uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE];
uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE];
uint32_t bis_sync_req[CONFIG_BT_BAP_BASS_MAX_SUBGROUPS];
} sync_states[CONFIG_BT_BAP_SCAN_DELEGATOR_RECV_STATE_COUNT];
@ -300,7 +300,7 @@ static int pa_sync_term_req_cb(struct bt_conn *conn,
static void broadcast_code_cb(struct bt_conn *conn,
const struct bt_bap_scan_delegator_recv_state *recv_state,
const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
struct sync_state *state;
@ -312,7 +312,7 @@ static void broadcast_code_cb(struct bt_conn *conn,
return;
}
(void)memcpy(state->broadcast_code, broadcast_code, BT_AUDIO_BROADCAST_CODE_SIZE);
(void)memcpy(state->broadcast_code, broadcast_code, BT_ISO_BROADCAST_CODE_SIZE);
SET_FLAG(flag_broadcast_code_received);
}

2
tests/bsim/bluetooth/audio/src/cap_acceptor_test.c
View file

@ -414,7 +414,7 @@ static int bis_sync_req_cb(struct bt_conn *conn,
static void broadcast_code_cb(struct bt_conn *conn,
const struct bt_bap_scan_delegator_recv_state *recv_state,
const uint8_t broadcast_code[BT_AUDIO_BROADCAST_CODE_SIZE])
const uint8_t broadcast_code[BT_ISO_BROADCAST_CODE_SIZE])
{
printk("Broadcast code received for %p\n", recv_state);

5
tests/bsim/bluetooth/audio/src/cap_commander_test.c
View file

@ -23,6 +23,7 @@
#include <zephyr/bluetooth/gap.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/hci_types.h>
#include <zephyr/bluetooth/iso.h>
#include <zephyr/bluetooth/uuid.h>
#include <zephyr/kernel.h>
#include <zephyr/net_buf.h>
@ -426,7 +427,7 @@ bap_broadcast_assistant_recv_state_cb(struct bt_conn *conn, int err,
const struct bt_bap_scan_delegator_recv_state *state)
{
char le_addr[BT_ADDR_LE_STR_LEN];
char bad_code[BT_AUDIO_BROADCAST_CODE_SIZE * 2 + 1];
char bad_code[BT_ISO_BROADCAST_CODE_SIZE * 2 + 1];
if (err != 0) {
FAIL("BASS recv state read failed (%d)\n", err);
@ -439,7 +440,7 @@ bap_broadcast_assistant_recv_state_cb(struct bt_conn *conn, int err,
}
bt_addr_le_to_str(&state->addr, le_addr, sizeof(le_addr));
(void)bin2hex(state->bad_code, BT_AUDIO_BROADCAST_CODE_SIZE, bad_code, sizeof(bad_code));
(void)bin2hex(state->bad_code, BT_ISO_BROADCAST_CODE_SIZE, bad_code, sizeof(bad_code));
printk("BASS recv state: src_id %u, addr %s, sid %u, sync_state %u, "
"encrypt_state %u%s%s\n",
state->src_id, le_addr, state->adv_sid, state->pa_sync_state, state->encrypt_state,