Skip to content

Commit 0534720

Browse files
gWaceyjukkar
authored andcommitted
applications: nrf5340_audio: Updates for upmerge
As using the deprecated USB stack, must turn off deprecation warnings with CONFIG_DEPRECATION_TEST=y. Change to the endpoint structure. Signed-off-by: Graham Wacey <graham.wacey@nordicsemi.no>
1 parent 80e680d commit 0534720

4 files changed

Lines changed: 12 additions & 1 deletion

File tree

applications/nrf5340_audio/prj.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ CONFIG_BT_HCI_CORE_LOG_LEVEL_WRN=y
7575
CONFIG_BT_ISO_TX_BUF_COUNT=3
7676
CONFIG_BT_BUF_ACL_TX_COUNT=3
7777
CONFIG_BT_ATT_TX_COUNT=12
78+
79+
# Suppress the USB deprecation warning
80+
CONFIG_DEPRECATION_TEST=y

applications/nrf5340_audio/prj_fota.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,7 @@ CONFIG_SPI_NOR_SFDP_DEVICETREE=y
8686
CONFIG_BT_ISO_TX_BUF_COUNT=3
8787
CONFIG_BT_BUF_ACL_TX_COUNT=3
8888
CONFIG_BT_ATT_TX_COUNT=12
89+
90+
91+
# Suppress the USB deprecation warning
92+
CONFIG_DEPRECATION_TEST=y

applications/nrf5340_audio/prj_release.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ CONFIG_BT_ATT_TX_COUNT=12
3838
# USB VID and PID must be changed before production.
3939
# CONFIG_USB_DEVICE_VID=0x1915
4040
# CONFIG_USB_DEVICE_PID=0x530A
41+
42+
43+
# Suppress the USB deprecation warning
44+
CONFIG_DEPRECATION_TEST=y

applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ static bool is_any_active_streams(void)
562562
{
563563
for (int i = 0; i < ARRAY_SIZE(audio_streams); i++) {
564564
if (audio_streams[i].ep != NULL &&
565-
audio_streams[i].ep->status.state == BT_BAP_EP_STATE_STREAMING) {
565+
audio_streams[i].ep->state == BT_BAP_EP_STATE_STREAMING) {
566566
return true;
567567
}
568568
}

0 commit comments

Comments
 (0)