Bluetooth: BAP: Switch to new USB stack for BAP shell

Modify the BAP shell to use the new USB stack, as the current
one used is now deprecated.

Signed-off-by: Emil Gydesen <[email protected]>

Author: Thalley

subsys/bluetooth/audio/Kconfig.bap

@@ -1,7 +1,7 @@
 # Bluetooth Audio - Basic Audio Profile configuration options
 #
 # Copyright (c) 2020 Intel Corporation
-# Copyright (c) 2022-2023 Nordic Semiconductor ASA
+# Copyright (c) 2022-2025 Nordic Semiconductor ASA
 
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -283,5 +283,51 @@ config BT_BAP_DEBUG_STREAM_SEQ_NUM
 config BT_BAP_BASE
 	def_bool BT_BAP_BROADCAST_SINK || BT_BAP_BROADCAST_ASSISTANT || BT_BAP_SCAN_DELEGATOR
 
+# We use BT_BAP_STREAM as a common ground for audio, as that is set whenever
+# any audio stream functionality is enabled.
+if LIBLC3 && USBD_AUDIO2_CLASS && BT_SHELL && BT_BAP_STREAM
+config BT_BAP_SHELL_USB_PRODUCT
+	string "USB device sample product string"
+	default "Zephyr Audio Shell"
+	help
+	  USB device sample product string.
+
+config BT_BAP_SHELL_USB_VID
+	hex "USB device sample Vendor ID"
+	default 0x2fe3
+	help
+	  USB device sample Vendor ID. Defaults to the Zephyr Project.
+
+config BT_BAP_SHELL_USB_PID
+	hex "USB device sample Product ID"
+	default 0x0001
+	help
+	  USB device sample Product ID.
+
+config BT_BAP_SHELL_USB_SELF_POWERED
+	bool "USB device sample Self-powered attribute"
+	default y
+	help
+	  Set the Self-powered attribute in the sample configuration.
+
+config BT_BAP_SHELL_USB_REMOTE_WAKEUP
+	bool "USB device sample Remote Wakeup attribute"
+	help
+	  Set the Remote Wakeup attribute in the sample configuration.
+
+config BT_BAP_SHELL_USB_MAX_POWER
+	int "USB device sample bMaxPower value"
+	default 125
+	range 0 250
+	help
+	  bMaxPower value in the sample configuration in 2 mA units.
+
+config BT_BAP_SHELL_USB_20_EXTENSION_DESC
+	bool "Use default USB 2.0 Extension Descriptor"
+	depends on USBD_BOS_SUPPORT
+	help
+	  Set bcdUSB value to 0201 and use default USB 2.0 Extension Descriptor.
+endif # LIBLC3 && USBD_AUDIO2_CLASS && BT_SHELL && BT_BAP_STREAM
+
 rsource "Kconfig.pacs"
 rsource "Kconfig.ascs"

subsys/bluetooth/audio/shell/CMakeLists.txt

@@ -89,7 +89,7 @@ zephyr_library_sources_ifdef(
   CONFIG_BT_BAP_STREAM
   bap.c
   )
-if (CONFIG_LIBLC3 AND CONFIG_USB_DEVICE_AUDIO)
+if (CONFIG_LIBLC3 AND CONFIG_USBD_AUDIO2_CLASS)
 	zephyr_library_sources(bap_usb.c)
 endif()
 zephyr_library_sources_ifdef(

subsys/bluetooth/audio/shell/audio.h

@@ -115,13 +115,13 @@ struct shell_stream {
 			size_t lc3_sdu_cnt;
 			lc3_encoder_mem_48k_t lc3_encoder_mem;
 			lc3_encoder_t lc3_encoder;
-#if defined(CONFIG_USB_DEVICE_AUDIO)
+#if defined(CONFIG_USBD_AUDIO2_CLASS)
 			/* Indicates where to read left USB data in the ring buffer */
 			size_t left_read_idx;
 			/* Indicates where to read right USB data in the ring buffer */
 			size_t right_read_idx;
 			size_t right_ring_buf_fail_cnt;
-#endif /* CONFIG_USB_DEVICE_AUDIO */
+#endif /* CONFIG_USBD_AUDIO2_CLASS */
 #endif /* CONFIG_LIBLC3 */
 		} tx;
 #endif /* CONFIG_BT_AUDIO_TX */

subsys/bluetooth/audio/shell/bap.c

@@ -57,7 +57,7 @@
 #define IS_BAP_INITIATOR                                                                           \
 	(IS_ENABLED(CONFIG_BT_BAP_BROADCAST_SOURCE) || IS_ENABLED(CONFIG_BT_BAP_UNICAST_CLIENT))
 
-#define GENERATE_SINE_SUPPORTED (IS_ENABLED(CONFIG_LIBLC3) && !IS_ENABLED(CONFIG_USB_DEVICE_AUDIO))
+#define GENERATE_SINE_SUPPORTED (IS_ENABLED(CONFIG_LIBLC3) && !IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS))
 
 #if defined(CONFIG_BT_BAP_UNICAST)
 
@@ -318,7 +318,7 @@ static int init_lc3_encoder(struct shell_stream *sh_stream)
 		return -EINVAL;
 	}
 
-	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+	if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 		const size_t frame_size = bap_usb_get_frame_size(sh_stream);
 
 		if (frame_size > sizeof(lc3_tx_buf)) {
@@ -337,7 +337,7 @@ static int init_lc3_encoder(struct shell_stream *sh_stream)
 
 	sh_stream->tx.lc3_encoder =
 		lc3_setup_encoder(sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz,
-				  IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) ? USB_SAMPLE_RATE : 0,
+				  IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS) ? USB_SAMPLE_RATE : 0,
 				  &sh_stream->tx.lc3_encoder_mem);
 	if (sh_stream->tx.lc3_encoder == NULL) {
 		bt_shell_error("Failed to setup LC3 encoder - wrong parameters?\n");
@@ -375,7 +375,7 @@ static bool encode_frame(struct shell_stream *sh_stream, uint8_t index, size_t f
 	const uint16_t octets_per_frame = sh_stream->lc3_octets_per_frame;
 	int lc3_ret;
 
-	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+	if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 		enum bt_audio_location chan_alloc;
 		int err;
 
@@ -432,7 +432,7 @@ static size_t encode_frame_block(struct shell_stream *sh_stream, size_t frame_cn
 
 static void do_lc3_encode(struct shell_stream *sh_stream, struct net_buf *out_buf)
 {
-	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) && !bap_usb_can_get_full_sdu(sh_stream)) {
+	if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS) && !bap_usb_can_get_full_sdu(sh_stream)) {
 		/* No op - Will just send empty SDU */
 	} else {
 		size_t frame_cnt = 0U;
@@ -2633,7 +2633,7 @@ static int init_lc3_decoder(struct shell_stream *sh_stream)
 	/* Create the decoder instance. This shall complete before stream_started() is called. */
 	sh_stream->rx.lc3_decoder =
 		lc3_setup_decoder(sh_stream->lc3_frame_duration_us, sh_stream->lc3_freq_hz,
-				  IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) ? USB_SAMPLE_RATE : 0,
+				  IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS) ? USB_SAMPLE_RATE : 0,
 				  &sh_stream->rx.lc3_decoder_mem);
 	if (sh_stream->rx.lc3_decoder == NULL) {
 		bt_shell_error("Failed to setup LC3 decoder - wrong parameters?\n");
@@ -2694,7 +2694,7 @@ static size_t decode_frame_block(struct lc3_data *data, size_t frame_cnt)
 		if (decode_frame(data, frame_cnt + decoded_frames)) {
 			decoded_frames++;
 
-			if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+			if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 				enum bt_audio_location chan_alloc;
 				int err;
 
@@ -2722,7 +2722,7 @@ static size_t decode_frame_block(struct lc3_data *data, size_t frame_cnt)
 			/* If decoding failed, we clear the data to USB as it would contain
 			 * invalid data
 			 */
-			if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+			if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 				bap_usb_clear_frames_to_usb();
 			}
 
@@ -3008,7 +3008,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 				return;
 			}
 
-			if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+			if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 				/* Always mark as active when using USB */
 				sh_stream->tx.active = true;
 			}
@@ -3029,7 +3029,7 @@ static void stream_started_cb(struct bt_bap_stream *bap_stream)
 
 			sh_stream->rx.decoded_cnt = 0U;
 
-			if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+			if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 				if ((sh_stream->lc3_chan_allocation &
 				     BT_AUDIO_LOCATION_FRONT_LEFT) != 0) {
 					if (usb_left_stream == NULL) {
@@ -3148,7 +3148,7 @@ static void clear_stream_data(struct shell_stream *sh_stream)
 	sh_stream->is_rx = sh_stream->is_tx = false;
 
 #if defined(CONFIG_LIBLC3)
-	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO)) {
+	if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS)) {
 		update_usb_streams(sh_stream);
 	}
 #endif /* CONFIG_LIBLC3 */
@@ -3931,7 +3931,7 @@ static int cmd_init(const struct shell *sh, size_t argc, char *argv[])
 
 #endif /* CONFIG_BT_AUDIO_TX */
 
-	if (IS_ENABLED(CONFIG_USB_DEVICE_AUDIO) &&
+	if (IS_ENABLED(CONFIG_USBD_AUDIO2_CLASS) &&
 	    (IS_ENABLED(CONFIG_BT_AUDIO_RX) || IS_ENABLED(CONFIG_BT_AUDIO_TX))) {
 		err = bap_usb_init();
 		__ASSERT(err == 0, "Failed to enable USB: %d", err);