This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new 718129445 Initial commit adding BASS in bttester
718129445 is described below
commit 718129445d3886943688d8c7020b00bd4d2a65d6
Author: Szymon Czapracki <[email protected]>
AuthorDate: Mon Apr 15 14:56:19 2024 +0200
Initial commit adding BASS in bttester
Adding BASS support in bttester
---
apps/bttester/pkg.yml | 2 +
apps/bttester/src/btp/btp_bap.h | 15 ++-
apps/bttester/src/btp/btp_gap.h | 10 ++
apps/bttester/src/btp/bttester.h | 4 +-
apps/bttester/src/btp_bap.c | 266 ++++++++++++++++++++++++++++++++++++++-
apps/bttester/src/btp_core.c | 2 +-
apps/bttester/src/btp_gap.c | 38 ++++++
apps/bttester/syscfg.yml | 16 ++-
8 files changed, 340 insertions(+), 13 deletions(-)
diff --git a/apps/bttester/pkg.yml b/apps/bttester/pkg.yml
index e763185fe..0972cb7a2 100644
--- a/apps/bttester/pkg.yml
+++ b/apps/bttester/pkg.yml
@@ -32,10 +32,12 @@ pkg.deps:
- "@apache-mynewt-core/sys/stats"
- "@apache-mynewt-core/sys/shell"
- "@apache-mynewt-nimble/nimble/host"
+ - "@apache-mynewt-nimble/nimble/host/audio"
- "@apache-mynewt-nimble/nimble/host/util"
- "@apache-mynewt-nimble/nimble/host/services/gap"
- "@apache-mynewt-nimble/nimble/host/services/gatt"
- "@apache-mynewt-nimble/nimble/host/services/dis"
+ - "@apache-mynewt-nimble/nimble/host/audio/services/bass"
- "@apache-mynewt-nimble/nimble/host/store/config"
- "@apache-mynewt-core/hw/drivers/uart"
- "@apache-mynewt-core/hw/drivers/rtt"
diff --git a/apps/bttester/src/btp/btp_bap.h b/apps/bttester/src/btp/btp_bap.h
index f25ab1474..804c9d4c8 100644
--- a/apps/bttester/src/btp/btp_bap.h
+++ b/apps/bttester/src/btp/btp_bap.h
@@ -84,11 +84,24 @@ struct bap_bap_broadcast_source_stop_cmd {
} __packed;
#define BTP_BAP_BROADCAST_SINK_SETUP 0x0a
+
+#define BTP_BAP_BROADCAST_SINK_STOP 0x0f
+struct btp_bap_broadcast_sink_stop_cmd {
+ ble_addr_t address;
+ uint8_t broadcast_id[3];
+} __packed;
+
+#define BTP_BAP_SET_BROADCAST_CODE 0x17
+struct btp_bap_set_broadcast_code_cmd {
+ ble_addr_t addr;
+ uint8_t source_id;
+ uint8_t broadcast_code[16];
+} __packed;
+
#define BTP_BAP_BROADCAST_SINK_RELEASE 0x0b
#define BTP_BAP_BROADCAST_SCAN_START 0x0c
#define BTP_BAP_BROADCAST_SCAN_STOP 0x0d
#define BTP_BAP_BROADCAST_SINK_SYNC 0x0e
-#define BTP_BAP_BROADCAST_SINK_STOP 0x0f
#define BTP_BAP_BROADCAST_SINK_BIS_SYNC 0x10
#define BTP_BAP_DISCOVER_SCAN_DELEGATOR 0x11
#define BTP_BAP_BROADCAST_ASSISTANT_SCAN_START 0x12
diff --git a/apps/bttester/src/btp/btp_gap.h b/apps/bttester/src/btp/btp_gap.h
index 2a87b1293..9c691878f 100644
--- a/apps/bttester/src/btp/btp_gap.h
+++ b/apps/bttester/src/btp/btp_gap.h
@@ -70,6 +70,7 @@ struct btp_gap_read_controller_index_list_rp {
#define BTP_GAP_SETTINGS_PRIVACY 13
#define BTP_GAP_SETTINGS_CONTROLLER_CONFIG 14
#define BTP_GAP_SETTINGS_STATIC_ADDRESS 15
+#define BTP_GAP_SETTINGS_EXTENDED_ADVERTISING 17
#define BTP_GAP_SETTINGS_PERIODIC_ADVERTISING 18
#define BTP_GAP_READ_CONTROLLER_INFO 0x03
@@ -258,6 +259,15 @@ struct btp_gap_set_filter_accept_list_cmd {
ble_addr_t addrs[];
} __packed;
+#define GAP_SET_EXT_ADV 0x21
+struct btp_gap_set_ext_advertising_cmd {
+ uint8_t setting;
+} __packed;
+
+struct btp_gap_set_ext_advertising_rp {
+ uint32_t current_settings;
+} __packed;
+
#define GAP_PADV_CONFIGURE 0x22
struct gap_periodic_adv_configure_cmd {
uint8_t flags;
diff --git a/apps/bttester/src/btp/bttester.h b/apps/bttester/src/btp/bttester.h
index 7cb82b5c9..87068d2a7 100644
--- a/apps/bttester/src/btp/bttester.h
+++ b/apps/bttester/src/btp/bttester.h
@@ -142,12 +142,12 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt,
void *arg);
int
gatt_svr_init(void);
-#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
+#if MYNEWT_VAL(BLE_AUDIO)
uint8_t
tester_init_bap(void);
uint8_t
tester_unregister_bap(void);
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
+#endif /* MYNEWT_VAL(BLE_AUDIO) */
#endif /* __BTTESTER_H__ */
diff --git a/apps/bttester/src/btp_bap.c b/apps/bttester/src/btp_bap.c
index 5a2d06c81..37ecedb0e 100644
--- a/apps/bttester/src/btp_bap.c
+++ b/apps/bttester/src/btp_bap.c
@@ -19,22 +19,24 @@
/* btp_bap.c - Bluetooth Basic Audio Profile Tester */
+#include "btp/bttester.h"
#include "syscfg/syscfg.h"
+#include <string.h>
+
#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
#include "btp/btp_bap.h"
-
#include "btp/btp.h"
#include "console/console.h"
-#include "nimble/ble.h"
#include "host/ble_hs.h"
#include "host/util/util.h"
#include "math.h"
#include "audio/ble_audio_broadcast_source.h"
+#include "audio/ble_audio_broadcast_sink.h"
#include "audio/ble_audio.h"
#include "host/ble_iso.h"
@@ -42,6 +44,13 @@
static struct ble_audio_big_subgroup big_subgroup;
+static struct broadcast_sink {
+ ble_addr_t addr;
+ uint8_t source_id;
+ uint8_t broadcast_code[BLE_AUDIO_BROADCAST_CODE_SIZE];
+} sinks[MYNEWT_VAL(BLE_AUDIO_BROADCAST_SINK_MAX)];
+
+static uint8_t sink_num = 0;
static uint8_t id_addr_type;
static uint8_t audio_data[155];
static uint16_t max_sdu;
@@ -107,7 +116,7 @@ iso_event(struct ble_iso_event *event, void *arg)
switch (event->type) {
case BLE_ISO_EVENT_BIG_CREATE_COMPLETE:
- console_printf("BIG created\n");
+ console_printf("%s: BIG created\n", __func__);
if (event->big_created.desc.num_bis >
MYNEWT_VAL(BROADCASTER_CHAN_NUM)) {
return BLE_HS_EINVAL;
@@ -117,7 +126,7 @@ iso_event(struct ble_iso_event *event, void *arg)
}
return 0;
case BLE_ISO_EVENT_BIG_TERMINATE_COMPLETE:
- console_printf("BIG terminated\n");
+ console_printf("%s: BIG terminated\n", __func__);
return 0;
default:
return BLE_HS_ENOTSUP;
@@ -319,6 +328,74 @@ broadcast_source_start(const void *cmd, uint16_t cmd_len,
void *rsp,
return BTP_STATUS_SUCCESS;
}
+static uint8_t
+broadcast_code_set(const void *cmd, uint16_t cmd_len, void *rsp,
+ uint16_t *rsp_len)
+{
+ const struct btp_bap_set_broadcast_code_cmd *cp = cmd;
+
+ if (sink_num > MYNEWT_VAL(BLE_AUDIO_BROADCAST_SINK_MAX)) {
+ return BTP_STATUS_FAILED;
+ }
+
+ sinks[sink_num].addr = cp->addr;
+ sinks[sink_num].addr.type = cp->addr.type;
+ sinks[sink_num].source_id = cp->source_id;
+
+ memcpy(sinks[sink_num].broadcast_code, cp->broadcast_code,
+ BLE_AUDIO_BROADCAST_CODE_SIZE);
+
+ sink_num++;
+
+ return BTP_STATUS_SUCCESS;
+}
+
+static uint8_t
+broadcast_sink_setup(const void *cmd, uint16_t cmd_len, void *rsp,
+ uint16_t *rsp_len)
+{
+ int rc, i;
+ struct ble_audio_broadcast_sink_add_params params = {0};
+
+ for (i = 0; i < sink_num; i++) {
+ memcpy(params.broadcast_code, sinks[i].broadcast_code,
+ BLE_AUDIO_BROADCAST_CODE_SIZE);
+ params.broadcast_code_is_valid = true;
+ rc = ble_audio_broadcast_sink_start(sinks[i].source_id, ¶ms);
+ if (rc) {
+ return BTP_STATUS_FAILED;
+ }
+ }
+
+ return BTP_STATUS_SUCCESS;
+}
+
+static int
+scan_delegator_receive_state_foreach_fn(struct
ble_audio_scan_delegator_receive_state_entry *entry,
+ void *addr)
+{
+ if (ble_addr_cmp(addr, &entry->source_desc.addr)) {
+ ble_audio_broadcast_sink_stop(entry->source_id);
+ }
+
+ return 0;
+}
+
+static uint8_t
+broadcast_sink_stop(const void *cmd, uint16_t cmd_len, void *rsp,
+ uint16_t *rsp_len)
+{
+ ble_addr_t addr;
+ const struct btp_bap_broadcast_sink_stop_cmd *cp = cmd;
+
+ addr = cp->address;
+
+
ble_audio_scan_delegator_receive_state_foreach(scan_delegator_receive_state_foreach_fn,
+ &addr);
+
+ return BTP_STATUS_SUCCESS;
+}
+
static uint8_t
broadcast_source_stop(const void *cmd, uint16_t cmd_len, void *rsp,
uint16_t *rsp_len)
@@ -371,8 +448,172 @@ static const struct btp_handler handlers[] = {
.expect_len = sizeof(struct bap_bap_broadcast_source_stop_cmd),
.func = broadcast_source_stop,
},
+ {
+ .opcode = BTP_BAP_SET_BROADCAST_CODE,
+ .index = BTP_INDEX,
+ .expect_len = sizeof(struct btp_bap_set_broadcast_code_cmd),
+ .func = broadcast_code_set,
+ },
+ {
+ .opcode = BTP_BAP_BROADCAST_SINK_SETUP,
+ .index = BTP_INDEX,
+ .expect_len = 0,
+ .func = broadcast_sink_setup,
+ },
+ {
+ .opcode = BTP_BAP_BROADCAST_SINK_STOP,
+ .index = BTP_INDEX,
+ .expect_len = sizeof(struct btp_bap_broadcast_sink_stop_cmd),
+ .func = broadcast_sink_stop,
+ },
};
+#define BROADCAST_SINK_PA_SYNC_TIMEOUT_DEFAULT 0x07D0
+
+static int
+broadcast_sink_pa_sync_params_get(struct ble_gap_periodic_sync_params *params)
+{
+ params->skip = 0;
+ params->sync_timeout = BROADCAST_SINK_PA_SYNC_TIMEOUT_DEFAULT;
+ params->reports_disabled = false;
+
+ return 0;
+}
+
+static int
+broadcast_sink_disc_start(const struct ble_gap_ext_disc_params *params)
+{
+ uint8_t own_addr_type;
+ int rc;
+
+ /* Figure out address to use while scanning. */
+ rc = ble_hs_id_infer_auto(0, &own_addr_type);
+ if (rc != 0) {
+ console_printf("%s: determining own address type failed (%d)",
__func__, rc);
+ assert(0);
+ }
+
+ rc = ble_gap_ext_disc(own_addr_type, 0, 0, 0, 0, 0, params, NULL, NULL,
NULL);
+ if (rc != 0) {
+ console_printf("%s: ext disc failed (%d)", __func__, rc);
+ }
+
+ return rc;
+}
+
+static int
+broadcast_sink_disc_stop(void)
+{
+ int rc;
+
+ rc = ble_gap_disc_cancel();
+ if (rc != 0) {
+ console_printf("%s: disc cancel failed (%d)", __func__, rc);
+ }
+
+ return rc;
+}
+
+static int
+broadcast_sink_action_fn(struct ble_audio_broadcast_sink_action *action, void
*arg)
+{
+ switch (action->type) {
+ case BLE_AUDIO_BROADCAST_SINK_ACTION_PA_SYNC:
+ return broadcast_sink_pa_sync_params_get(action->pa_sync.out_params);
+ case BLE_AUDIO_BROADCAST_SINK_ACTION_BIG_SYNC:
+ break;
+ case BLE_AUDIO_BROADCAST_SINK_ACTION_BIS_SYNC:
+ return 0;
+ case BLE_AUDIO_BROADCAST_SINK_ACTION_DISC_START:
+ return broadcast_sink_disc_start(action->disc_start.params_preferred);
+ case BLE_AUDIO_BROADCAST_SINK_ACTION_DISC_STOP:
+ return broadcast_sink_disc_stop();
+ default:
+ assert(false);
+ return BLE_HS_ENOTSUP;
+ }
+
+ return 0;
+}
+
+static int
+broadcast_sink_audio_event_handler(struct ble_audio_event *event, void *arg)
+{
+ switch (event->type) {
+ case BLE_AUDIO_EVENT_BROADCAST_SINK_PA_SYNC_STATE:
+ console_printf("%s: source_id=0x%02x PA sync: %s\n", __func__,
+ event->broadcast_sink_pa_sync_state.source_id,
+ ble_audio_broadcast_sink_sync_state_str(
+ event->broadcast_sink_pa_sync_state.state));
+ break;
+ case BLE_AUDIO_EVENT_BROADCAST_SINK_BIS_SYNC_STATE:
+ console_printf("%s: source_id=0x%02x bis_index=0x%02x BIS sync: %s\n",
+ __func__,
event->broadcast_sink_bis_sync_state.source_id,
+ event->broadcast_sink_bis_sync_state.bis_index,
+ ble_audio_broadcast_sink_sync_state_str(
+ event->broadcast_sink_bis_sync_state.state));
+ if (event->broadcast_sink_bis_sync_state.state ==
+ BLE_AUDIO_BROADCAST_SINK_SYNC_STATE_ESTABLISHED) {
+ console_printf("%s: conn_handle=0x%04x\n", __func__,
+ event->broadcast_sink_bis_sync_state.conn_handle);
+ }
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static int
+scan_delegator_pick_source_id_to_swap(uint8_t *out_source_id_to_swap)
+{
+ /* TODO: Add some logic here */
+ *out_source_id_to_swap = 0;
+
+ return 0;
+}
+
+static int
+scan_delegator_action_fn(struct ble_audio_scan_delegator_action *action, void
*arg)
+{
+ switch (action->type) {
+ case BLE_AUDIO_SCAN_DELEGATOR_ACTION_SOURCE_ADD:
+ console_printf("%s: Source Add:\nsource_id=%u\n", __func__,
+ action->source_add.source_id);
+ if (action->source_add.out_source_id_to_swap == NULL) {
+ return 0;
+ }
+ return
scan_delegator_pick_source_id_to_swap(action->source_add.out_source_id_to_swap);
+ case BLE_AUDIO_SCAN_DELEGATOR_ACTION_SOURCE_MODIFY:
+ console_printf("%s: Source Modify:\nsource_id=%u\n", __func__,
+ action->source_modify.source_id);
+ break;
+ case BLE_AUDIO_SCAN_DELEGATOR_ACTION_SOURCE_REMOVE:
+ console_printf("%s: Source Remove:\nsource_id=%u\n", __func__,
+ action->source_remove.source_id);
+ break;
+ default:
+ assert(false);
+ return BLE_HS_ENOTSUP;
+ }
+
+ return 0;
+}
+
+static int
+scan_delegator_audio_event_handler(struct ble_audio_event *event, void *arg)
+{
+ switch (event->type) {
+ case BLE_AUDIO_EVENT_BROADCAST_ANNOUNCEMENT:
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
uint8_t
tester_init_bap(void)
{
@@ -405,6 +646,23 @@ tester_init_bap(void)
return BTP_STATUS_FAILED;
}
+ static struct ble_audio_event_listener broadcast_sink_listener;
+
+ rc = ble_audio_broadcast_sink_cb_set(broadcast_sink_action_fn, NULL);
+ assert(rc == 0);
+
+ rc = ble_audio_event_listener_register(&broadcast_sink_listener,
+ broadcast_sink_audio_event_handler,
NULL);
+
+ static struct ble_audio_event_listener scan_delegator_listener;
+
+ rc = ble_audio_scan_delegator_action_fn_set(scan_delegator_action_fn,
NULL);
+ assert(rc == 0);
+
+ rc = ble_audio_event_listener_register(&scan_delegator_listener,
+ scan_delegator_audio_event_handler,
NULL);
+ assert(rc == 0);
+
tester_register_command_handlers(BTP_SERVICE_ID_BAP, handlers,
ARRAY_SIZE(handlers));
diff --git a/apps/bttester/src/btp_core.c b/apps/bttester/src/btp_core.c
index a7b187832..eeae816a9 100644
--- a/apps/bttester/src/btp_core.c
+++ b/apps/bttester/src/btp_core.c
@@ -106,7 +106,7 @@ register_service(const void *cmd, uint16_t cmd_len,
case BTP_SERVICE_ID_BAP:
status = tester_init_bap();
break;
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
+#endif /* MYNEWT_VAL(BLE_ISO_BROADCASTER) */
case BTP_SERVICE_ID_GATTC:
status = tester_init_gatt_cl();
break;
diff --git a/apps/bttester/src/btp_gap.c b/apps/bttester/src/btp_gap.c
index d0aa7ce06..f6747b0f4 100644
--- a/apps/bttester/src/btp_gap.c
+++ b/apps/bttester/src/btp_gap.c
@@ -160,6 +160,7 @@ supported_commands(const void *cmd, uint16_t cmd_len,
/* octet 4 */
#if MYNEWT_VAL(BLE_PERIODIC_ADV)
+ tester_set_bit(rp->data, GAP_SET_EXT_ADV);
tester_set_bit(rp->data, GAP_PADV_CONFIGURE);
tester_set_bit(rp->data, GAP_PADV_START);
tester_set_bit(rp->data, GAP_PADV_SET_DATA);
@@ -2000,6 +2001,36 @@ set_filter_accept_list(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_SUCCESS;
}
+#if MYNEWT_VAL(BLE_EXT_ADV)
+static uint8_t
+set_ext_advertising(const void *cmd, uint16_t cmd_len,
+ void *rsp, uint16_t *rsp_len)
+{
+ struct btp_gap_set_ext_advertising_rp *rp = rsp;
+ const struct btp_gap_set_ext_advertising_cmd *cp = cmd;
+
+ if (current_settings & BIT(BTP_GAP_SETTINGS_ADVERTISING)) {
+ return BTP_STATUS_FAILED;
+ }
+
+ if (cp->setting) {
+ current_settings |= BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+ adv_params.legacy_pdu = 0;
+ /* TODO: This is temporary until auto-pts nonscannable implementation
*/
+ adv_params.scannable = 0;
+ } else {
+ current_settings &= ~BIT(BTP_GAP_SETTINGS_EXTENDED_ADVERTISING);
+ adv_params.legacy_pdu = 1;
+ }
+
+ rp->current_settings = htole32(current_settings);
+ *rsp_len = sizeof(*rp);
+
+ return BTP_STATUS_SUCCESS;
+}
+
+#endif
+
#if MYNEWT_VAL(BLE_PERIODIC_ADV)
static uint8_t
periodic_adv_configure(const void *cmd, uint16_t cmd_len,
@@ -2330,6 +2361,13 @@ static const struct btp_handler handlers[] = {
.expect_len = BTP_HANDLER_LENGTH_VARIABLE,
.func = set_filter_accept_list,
},
+#if MYNEWT_VAL(BLE_EXT_ADV)
+ {
+ .opcode = GAP_SET_EXT_ADV,
+ .expect_len = sizeof(struct btp_gap_set_ext_advertising_cmd),
+ .func = set_ext_advertising,
+ },
+#endif /* BLE_EXT_ADV*/
#if MYNEWT_VAL(BLE_PERIODIC_ADV)
{
.opcode = GAP_PADV_CONFIGURE,
diff --git a/apps/bttester/syscfg.yml b/apps/bttester/syscfg.yml
index 80c377a7c..fea32fccd 100644
--- a/apps/bttester/syscfg.yml
+++ b/apps/bttester/syscfg.yml
@@ -93,15 +93,23 @@ syscfg.vals:
BLE_ISO: 1
BLE_AUDIO: 1
+ BLE_AUDIO_BROADCAST_SINK: 1
+ BLE_AUDIO_BROADCAST_SINK_MAX: 2
+ BLE_PERIODIC_ADV_SYNC_TRANSFER: 1
+ BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS: 1
BLE_ROLE_BROADCASTER: 1
- BLE_ISO_MAX_BISES: 1
- BLE_ISO_MAX_BIGS: 1
+ BLE_ISO_BROADCAST_SOURCE: 1
+ BLE_ISO_BROADCAST_SINK: 1
+ BLE_ISO_MAX_BISES: 3
+ BLE_ISO_MAX_BIGS: 3
BLE_EXT_ADV: 1
BLE_PHY_2M: 1
BLE_EXT_ADV_MAX_SIZE: 40
BLE_PERIODIC_ADV: 1
BLE_ISO_BROADCAST_SOURCE: 1
- BLE_MULTI_ADV_INSTANCES: 1
+ BLE_MULTI_ADV_INSTANCES: 3
+ BLE_SVC_AUDIO_BASS_METADATA_MAX_SZ: 256
+ BLE_SVC_AUDIO_BASS_SUB_NUM_MAX: 10
OS_MAIN_STACK_SIZE: 512
SHELL_TASK: 0
@@ -163,5 +171,3 @@ syscfg.vals:
BLE_MESH_TX_SEG_MSG_COUNT: 2
BLE_MAX_CONNECTIONS: 8
-
-
