nimble/bttester: Various fixes in BAP bttester part
MYNEWT_VAL is corrected in multiple places for an up-to-date name.
Missing semicolon and invalid function name are fixed in btp_bap.c
Codec configuration is now set on BIS level, as setting it on subgroup level
caused tests to fail.
diff --git a/apps/bttester/src/btp/bttester.h b/apps/bttester/src/btp/bttester.h
index 5d7e121..7cb82b5 100644
--- a/apps/bttester/src/btp/bttester.h
+++ b/apps/bttester/src/btp/bttester.h
@@ -142,12 +142,12 @@
int
gatt_svr_init(void);
-#if MYNEWT_VAL(BLE_ISO_BROADCASTER)
+#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
uint8_t
tester_init_bap(void);
uint8_t
tester_unregister_bap(void);
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCASTER) */
+#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
#endif /* __BTTESTER_H__ */
diff --git a/apps/bttester/src/btp_bap.c b/apps/bttester/src/btp_bap.c
index b6a92ac..5a2d06c 100644
--- a/apps/bttester/src/btp_bap.c
+++ b/apps/bttester/src/btp_bap.c
@@ -21,7 +21,7 @@
#include "syscfg/syscfg.h"
-#if MYNEWT_VAL(BLE_ISO_BROADCASTER)
+#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
#include "btp/btp_bap.h"
@@ -38,9 +38,6 @@
#include "audio/ble_audio.h"
#include "host/ble_iso.h"
-#include "bsp/bsp.h"
-
-
#define BROADCAST_ADV_INSTANCE 1
static struct ble_audio_big_subgroup big_subgroup;
@@ -158,7 +155,6 @@
uint16_t chan_loc = BLE_AUDIO_LOCATION_FRONT_LEFT |
BLE_AUDIO_LOCATION_FRONT_RIGHT;
-
uint8_t codec_spec_config[] =
BLE_AUDIO_BUILD_CODEC_CONFIG(sampling_freq, frame_duration, chan_loc,
max_sdu, );
@@ -166,25 +162,24 @@
tester_base.broadcast_id = sampling_freq;
tester_base.presentation_delay = sampling_freq * 10000;
- big_subgroup.bis_cnt = MYNEWT_VAL(BROADCASTER_CHAN_NUM);
+ big_subgroup.bis_cnt = MYNEWT_VAL(BLE_ISO_MAX_BISES);
/** LC3 */
big_subgroup.codec_id.format = 0x06;
- big_subgroup.codec_spec_config_len = sizeof(codec_spec_config);
-
- big_subgroup.codec_spec_config_len = os_memblock_get(&codec_spec_pool);
-
- memcpy(big_subgroup.codec_spec_config,
- codec_spec_config,
- sizeof(codec_spec_config));
+ big_subgroup.codec_spec_config_len = 0;
bis = os_memblock_get(&bis_pool);
if (!bis) {
- return BLE_HS_ENOMEM
+ return BLE_HS_ENOMEM;
}
- bis->codec_spec_config_len = 0;
+ bis->codec_spec_config = os_memblock_get(&codec_spec_pool);
+ memcpy(bis->codec_spec_config,
+ codec_spec_config,
+ sizeof(codec_spec_config));
+ bis->codec_spec_config_len = sizeof(codec_spec_config);
+ bis->idx = 1;
STAILQ_INSERT_HEAD(&big_subgroup.bises, bis, next);
STAILQ_INSERT_HEAD(&tester_base.subs, &big_subgroup, next);
@@ -221,6 +216,15 @@
base_create(source_config);
+ big_params.sdu_interval = sdu_interval;
+ big_params.max_sdu = max_sdu;
+ big_params.max_transport_latency = 8;
+ big_params.rtn = source_config->rtn;
+ big_params.phy = BLE_HCI_LE_PHY_2M;
+ big_params.packing = 0;
+ big_params.framing = source_config->framing;
+ big_params.encryption = 0;
+
struct ble_gap_periodic_adv_params periodic_params = {
.itvl_min = 30,
.itvl_max = 30,
@@ -237,15 +241,6 @@
.sid = BROADCAST_ADV_INSTANCE,
};
- big_params.sdu_interval = sdu_interval;
- big_params.max_sdu = max_sdu;
- big_params.max_transport_latency = 8;
- big_params.rtn = source_config->rtn;
- big_params.phy = BLE_HCI_LE_PHY_2M;
- big_params.packing = 0;
- big_params.framing = source_config->framing;
- big_params.encryption = 0;
-
struct ble_broadcast_create_params create_params = {
.base = &tester_base,
.extended_params = &extended_params,
@@ -422,5 +417,5 @@
return BTP_STATUS_SUCCESS;
}
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCASTER) */
+#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
diff --git a/apps/bttester/src/btp_core.c b/apps/bttester/src/btp_core.c
index f7a4bc4..a7b1878 100644
--- a/apps/bttester/src/btp_core.c
+++ b/apps/bttester/src/btp_core.c
@@ -102,11 +102,11 @@
status = tester_init_mesh();
break;
#endif /* MYNEWT_VAL(BLE_MESH) */
-#if MYNEWT_VAL(BLE_ISO_BROADCASTER)
+#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
case BTP_SERVICE_ID_BAP:
status = tester_init_bap();
break;
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCASTER) */
+#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
case BTP_SERVICE_ID_GATTC:
status = tester_init_gatt_cl();
break;
@@ -159,11 +159,11 @@
case BTP_SERVICE_ID_GATTC:
status = tester_unregister_gatt_cl();
break;
-#if MYNEWT_VAL(BLE_ISO_BROADCASTER)
+#if MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE)
case BTP_SERVICE_ID_BAP:
status = tester_unregister_bap();
break;
-#endif /* MYNEWT_VAL(BLE_ISO_BROADCASTER) */
+#endif /* MYNEWT_VAL(BLE_ISO_BROADCAST_SOURCE) */
default:
status = BTP_STATUS_FAILED;
break;
diff --git a/apps/bttester/syscfg.yml b/apps/bttester/syscfg.yml
index bb4d6f7..80c377a 100644
--- a/apps/bttester/syscfg.yml
+++ b/apps/bttester/syscfg.yml
@@ -97,6 +97,8 @@
BLE_ISO_MAX_BISES: 1
BLE_ISO_MAX_BIGS: 1
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
