samples: bluetooth: le_audio: auracast: fix push-to-talk

Fixes PDM configuration when push-to-talk feature is
enabled. This also makes feature configurable.

Signed-off-by: Honkala Petri <petri.honkala@alifsemi.com>

Author: petrih-alifsemi

samples/bluetooth/le_audio/auracast/auracast_source/auracast_source.c

@@ -28,7 +28,8 @@ LOG_MODULE_REGISTER(auracast_source, CONFIG_AURACAST_SOURCE_LOG_LEVEL);
 
 #define MIC_NODE DT_ALIAS(pdm_mic)
 
-#define MIC_ENABLED (DT_NODE_EXISTS(MIC_NODE) && DT_NODE_EXISTS(DT_ALIAS(sw0)))
+#define MIC_ENABLED                                                                                \
+	(IS_ENABLED(CONFIG_AUDIO_DMIC) && DT_NODE_EXISTS(MIC_NODE) && DT_NODE_EXISTS(DT_ALIAS(sw0)))
 
 #define PRESENTATION_DELAY_US (CONFIG_LE_AUDIO_PRESENTATION_DELAY_MS * 1000)
 #define SUBGROUP_ID           0
@@ -545,6 +546,11 @@ static int configure_led(void)
 /* Initialisation to perform pre-main */
 static int auracast_source_init(void)
 {
+	if (!device_is_ready(DEVICE_DT_GET(MIC_NODE))) {
+		LOG_ERR("mic device is not ready");
+		return -1;
+	}
+
 	if (configure_button()) {
 		return -1;
 	}

samples/bluetooth/le_audio/auracast/src/audio_datapath.c

@@ -24,13 +24,7 @@
 #define INT_RAMFUNC
 #endif
 
-#define I2S_SINK_DEV DEVICE_DT_GET(CODEC_I2S_NODE)
-
-#if DT_NODE_EXISTS(I2S_MIC_NODE)
-#define I2S_SOURCE_DEV DEVICE_DT_GET(I2S_MIC_NODE)
-#else
-#define I2S_SOURCE_DEV I2S_SINK_DEV
-#endif
+#define CODEC_I2S_DEV DEVICE_DT_GET(CODEC_I2S_NODE)
 
 BUILD_ASSERT(!DT_PROP(CODEC_I2S_NODE, mono_mode), "I2S must be configured in stereo mode");
 
@@ -55,18 +49,12 @@ static int unicast_audio_path_init(void)
 		return -1;
 	}
 
-	ret = device_is_ready(I2S_SINK_DEV);
+	ret = device_is_ready(CODEC_I2S_DEV);
 	if (!ret) {
 		LOG_ERR("I2S is not ready");
 		return -1;
 	}
 
-	ret = device_is_ready(I2S_SOURCE_DEV);
-	if (!ret) {
-		LOG_ERR("I2S mic is not ready");
-		return -1;
-	}
-
 	/* Stop codec output if started during init */
 	audio_codec_stop_output(DEVICE_DT_GET(CODEC_CFG_NODE));
 
@@ -144,7 +132,7 @@ int audio_datapath_create_source(struct audio_datapath_config const *const cfg)
 	}
 
 	struct audio_encoder_params const enc_params = {
-		.i2s_dev = I2S_SOURCE_DEV,
+		.i2s_dev = CODEC_I2S_DEV,
 		.frame_duration_us = cfg->frame_duration_is_10ms ? 10000 : 7500,
 		.sampling_rate_hz = cfg->sampling_rate_hz,
 		.audio_buffer_len_us = cfg->pres_delay_us,
@@ -171,14 +159,12 @@ int audio_datapath_create_source(struct audio_datapath_config const *const cfg)
 #endif
 
 	if (cfg->mic_dev) {
-#if DT_NODE_EXISTS(I2S_MIC_NODE)
-		int ret = mic_configure(cfg->mic_dev, I2S_SOURCE_DEV, env.encoder);
+		int ret = mic_configure(cfg->mic_dev, CODEC_I2S_DEV, env.encoder);
 
 		if (ret != 0) {
 			LOG_ERR("Failed to configure mic input, err %d", ret);
 			return ret;
 		}
-#endif
 	}
 
 	LOG_DBG("Source audio datapath created");
@@ -241,7 +227,7 @@ int audio_datapath_create_sink(struct audio_datapath_config const *const cfg)
 	}
 
 	struct audio_decoder_params const dec_params = {
-		.i2s_dev = I2S_SINK_DEV,
+		.i2s_dev = CODEC_I2S_DEV,
 		.frame_duration_us = cfg->frame_duration_is_10ms ? 10000 : 7500,
 		.sampling_rate_hz = cfg->sampling_rate_hz,
 		.pres_delay_us = cfg->pres_delay_us,

samples/bluetooth/le_audio/auracast/src/audio_datapath.h

@@ -14,7 +14,6 @@
 
 #define CODEC_CFG_NODE DT_ALIAS(audio_codec)
 #define CODEC_I2S_NODE DT_ALIAS(i2s_bus)
-#define I2S_MIC_NODE   DT_ALIAS(i2s_mic)
 /* #define MCLK_GEN_NODE DT_ALIAS(mclk_gen) */
 
 struct audio_datapath_config {

samples/bluetooth/le_audio/auracast/src/mic_source.h

@@ -11,7 +11,9 @@
 #define MIC_SOURCE_H
 
 #include "bluetooth/le_audio/audio_encoder.h"
+#include <zephyr/toolchain.h>
 
+#if CONFIG_AUDIO_DMIC
 /**
  * @brief Configure microphone source
  *
@@ -23,7 +25,7 @@
  * @retval Negative error code on failure
  */
 int mic_configure(const struct device *mic_dev, const struct device *i2s_dev,
-		      struct audio_encoder *audio_encoder);
+		  struct audio_encoder *audio_encoder);
 
 /**
  * @brief Start the microphone source stream
@@ -42,4 +44,25 @@ void mic_stop(void);
  */
 void mic_control(bool const start);
 
+#else
+static inline int mic_configure(const struct device *mic_dev, const struct device *i2s_dev,
+				struct audio_encoder *audio_encoder)
+{
+	return 0;
+}
+
+static inline void mic_start(void)
+{
+}
+
+static inline void mic_stop(void)
+{
+}
+
+static inline void mic_control(bool const start)
+{
+	ARG_UNUSED(start);
+}
+#endif
+
 #endif /* MIC_SOURCE_H */