michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Shell: Fix build errors for USB=n

Browse source 
When CONFIG_USB_DEVICE_STACK=n then the sine wave
generator was enabled, which caused build errors.

This commit fixes those errors and also adds the
nRF5340 as a build target for the USB tests.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-05-14 13:31:25 +02:00 • committed by Carles Cufí
commit f573c3eb01
4 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/bluetooth/audio/shell/bap.c
View file

@ -3778,7 +3778,7 @@ static void start_sine_stream_cb(struct shell_stream *sh_stream, void *user_data
if (err != 0) { if (err != 0) {
shell_error(sh, "Failed to init LC3 %d for stream %p", err, bap_stream); shell_error(sh, "Failed to init LC3 %d for stream %p", err, bap_stream);
return -ENOEXEC; return;
} }
sh_stream->tx.active = true; sh_stream->tx.active = true;
@ -3791,7 +3791,6 @@ static void start_sine_stream_cb(struct shell_stream *sh_stream, void *user_data
static int cmd_start_sine(const struct shell *sh, size_t argc, char *argv[]) static int cmd_start_sine(const struct shell *sh, size_t argc, char *argv[])
{ {
bool start_all = false; bool start_all = false;
int err;
if (argc > 1) { if (argc > 1) {
if (strcmp(argv[1], "all") == 0) { if (strcmp(argv[1], "all") == 0) {
@ -3804,11 +3803,11 @@ static int cmd_start_sine(const struct shell *sh, size_t argc, char *argv[])
} }
if (start_all) { if (start_all) {
bap_foreach_stream(start_sine_stream_cb, sh); bap_foreach_stream(start_sine_stream_cb, (void *)sh);
} else { } else {
struct shell_stream *sh_stream = shell_stream_from_bap_stream(default_stream); struct shell_stream *sh_stream = shell_stream_from_bap_stream(default_stream);
start_sine_stream_cb(sh_stream, sh); start_sine_stream_cb(sh_stream, (void *)sh);
} }
return 0; return 0;
@ -3817,8 +3816,7 @@ static int cmd_start_sine(const struct shell *sh, size_t argc, char *argv[])
static void stop_sine_stream_cb(struct shell_stream *sh_stream, void *user_data) static void stop_sine_stream_cb(struct shell_stream *sh_stream, void *user_data)
{ {
if (sh_stream->is_tx) { if (sh_stream->is_tx) {
struct bt_bap_stream *bap_stream = struct bt_bap_stream *bap_stream = bap_stream_from_shell_stream(sh_stream);
bap_stream_from_shell_stream(&unicast_streams[i]);
const struct shell *sh = user_data; const struct shell *sh = user_data;
shell_print(sh, "Stopped transmitting on stream %p", bap_stream); shell_print(sh, "Stopped transmitting on stream %p", bap_stream);
@ -3842,11 +3840,11 @@ static int cmd_stop_sine(const struct shell *sh, size_t argc, char *argv[])
} }
if (stop_all) { if (stop_all) {
bap_foreach_stream(stop_sine_stream_cb, sh); bap_foreach_stream(stop_sine_stream_cb, (void *)sh);
} else { } else {
struct shell_stream *sh_stream = shell_stream_from_bap_stream(default_stream); struct shell_stream *sh_stream = shell_stream_from_bap_stream(default_stream);
stop_sine_stream_cb(sh_stream, sh) stop_sine_stream_cb(sh_stream, (void *)sh);
} }
return 0; return 0;

3
tests/bluetooth/shell/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
View file

@ -1,10 +1,13 @@
# For LC3 the following configs are needed # For LC3 the following configs are needed
CONFIG_FPU=y CONFIG_FPU=y
CONFIG_LIBLC3=y CONFIG_LIBLC3=y
# For USB audio the following configs are needed
CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_AUDIO=y CONFIG_USB_DEVICE_AUDIO=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr Shell USB" CONFIG_USB_DEVICE_PRODUCT="Zephyr Shell USB"
# The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
# inctease stack size for that thread. # inctease stack size for that thread.
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=5120 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=5120

10
tests/bluetooth/shell/boards/nrf5340dk_nrf5340_cpuapp.conf
View file

@ -1,6 +1,14 @@
# For LC3 the following configs are needed # For LC3 the following configs are needed
CONFIG_FPU=y CONFIG_FPU=y
CONFIG_LIBLC3=y CONFIG_LIBLC3=y
# For USB audio the following configs are needed
CONFIG_RING_BUFFER=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_AUDIO=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr Shell USB"
# The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
# inctease stack size for that thread. # inctease stack size for that thread.
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=5120
CONFIG_BT_TINYCRYPT_ECC=y

14
tests/bluetooth/shell/testcase.yaml
View file

@ -353,14 +353,24 @@ tests:
bluetooth.audio_shell.no_lc3: bluetooth.audio_shell.no_lc3:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
build_only: true build_only: true
platform_allow: native_posix platform_allow:
- nrf5340dk/nrf5340/cpuapp
- nrf5340_audio_dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
- nrf5340_audio_dk/nrf5340/cpuapp
extra_configs: extra_configs:
- CONFIG_FPU=n - CONFIG_FPU=n
- CONFIG_LIBLC3=n - CONFIG_LIBLC3=n
bluetooth.audio_shell.no_usb: bluetooth.audio_shell.no_usb:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
build_only: true build_only: true
platform_allow: native_posix platform_allow:
- nrf5340dk/nrf5340/cpuapp
- nrf5340_audio_dk/nrf5340/cpuapp
integration_platforms:
- nrf5340dk/nrf5340/cpuapp
- nrf5340_audio_dk/nrf5340/cpuapp
extra_configs: extra_configs:
- CONFIG_RING_BUFFER=n - CONFIG_RING_BUFFER=n
- CONFIG_USB_DEVICE_STACK=n - CONFIG_USB_DEVICE_STACK=n