From 324a1b416e6a65d21d201cecabeee5df1257f426 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Thu, 23 Jun 2022 15:36:36 +0200 Subject: [PATCH] ports: replace ENABLE_SCO_STEREO_PLAYBACK with HAVE_HAL_AUDIO_SINK_STEREO_ONLY --- .../template/btstack_example/src/btstack_config.h | 1 - port/stm32-f4discovery-cc256x/port/btstack_config.h | 2 +- port/stm32-f4discovery-cc256x/port/hal_audio_f4discovery.c | 2 +- port/stm32-f4discovery-usb/port/btstack_config.h | 1 + port/stm32-f4discovery-usb/port/hal_audio_f4discovery.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/btstack_config.h b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/btstack_config.h index 9761e7074..bab049167 100644 --- a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/btstack_config.h +++ b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/btstack_config.h @@ -22,7 +22,6 @@ #define ENABLE_LOG_ERROR #define ENABLE_PRINTF_HEXDUMP #define ENABLE_SCO_OVER_HCI -#define ENABLE_SCO_STEREO_PLAYBACK #define ENABLE_SEGGER_RTT // BTstack configuration. buffers, sizes, ... diff --git a/port/stm32-f4discovery-cc256x/port/btstack_config.h b/port/stm32-f4discovery-cc256x/port/btstack_config.h index b630adbec..659dac16c 100644 --- a/port/stm32-f4discovery-cc256x/port/btstack_config.h +++ b/port/stm32-f4discovery-cc256x/port/btstack_config.h @@ -11,6 +11,7 @@ #define HAVE_BTSTACK_STDIN #define HAVE_EMBEDDED_TIME_MS #define HAVE_HAL_AUDIO +#define HAVE_HAL_AUDIO_SINK_STEREO_ONLY // BTstack features that can be enabled #define ENABLE_BLE @@ -23,7 +24,6 @@ #define ENABLE_LOG_ERROR #define ENABLE_PRINTF_HEXDUMP #define ENABLE_SCO_OVER_HCI -#define ENABLE_SCO_STEREO_PLAYBACK #define ENABLE_SEGGER_RTT // BTstack configuration. buffers, sizes, ... diff --git a/port/stm32-f4discovery-cc256x/port/hal_audio_f4discovery.c b/port/stm32-f4discovery-cc256x/port/hal_audio_f4discovery.c index 73ea40b51..588ca6041 100644 --- a/port/stm32-f4discovery-cc256x/port/hal_audio_f4discovery.c +++ b/port/stm32-f4discovery-cc256x/port/hal_audio_f4discovery.c @@ -118,7 +118,7 @@ void hal_audio_sink_init(uint8_t channels, // F4 Discovery Audio BSP only supports stereo playback if (channels == 1){ - log_error("F4 Discovery Audio BSP only supports stereo playback. HFP/HSP demos using sco_demo_util, please #define ENABLE_SCO_STEREO_PLAYBACK"); + log_error("F4 Discovery Audio BSP only supports stereo playback. Please #define HAVE_HAL_AUDIO_SINK_STEREO_ONLY"); return; } diff --git a/port/stm32-f4discovery-usb/port/btstack_config.h b/port/stm32-f4discovery-usb/port/btstack_config.h index bc7b1e181..72ee4a195 100644 --- a/port/stm32-f4discovery-usb/port/btstack_config.h +++ b/port/stm32-f4discovery-usb/port/btstack_config.h @@ -11,6 +11,7 @@ #define HAVE_BTSTACK_STDIN #define HAVE_EMBEDDED_TIME_MS #define HAVE_HAL_AUDIO +#define HAVE_HAL_AUDIO_SINK_STEREO_ONLY // BTstack features that can be enabled #define ENABLE_BLE diff --git a/port/stm32-f4discovery-usb/port/hal_audio_f4discovery.c b/port/stm32-f4discovery-usb/port/hal_audio_f4discovery.c index 73ea40b51..6fc3a9c76 100644 --- a/port/stm32-f4discovery-usb/port/hal_audio_f4discovery.c +++ b/port/stm32-f4discovery-usb/port/hal_audio_f4discovery.c @@ -118,7 +118,7 @@ void hal_audio_sink_init(uint8_t channels, // F4 Discovery Audio BSP only supports stereo playback if (channels == 1){ - log_error("F4 Discovery Audio BSP only supports stereo playback. HFP/HSP demos using sco_demo_util, please #define ENABLE_SCO_STEREO_PLAYBACK"); + log_error("F4 Discovery Audio BSP only supports stereo playback. Please #define HAVE_HAL_AUDIO_SINK_STEREO_ONLY"); return; }