diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2c92a4e2..3acb245d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,8 @@ sc_usb_audio Change Log 6.30.0 ------ + - RESOLVED: Number of PDM microphone channels configured now based on + NUM_PDM_MICS define (previously hard-coded) - RESOLVED: PDM microphone clock divide now based MCLK defines (previously hard-coded) - CHANGE: Second microphone decimation core only run if NUM_PDM_MICS > 4 diff --git a/module_usb_audio/pdm_mics/mic_array_conf.h b/module_usb_audio/pdm_mics/mic_array_conf.h index a57e7753..e894cd10 100644 --- a/module_usb_audio/pdm_mics/mic_array_conf.h +++ b/module_usb_audio/pdm_mics/mic_array_conf.h @@ -1,7 +1,9 @@ #ifndef MIC_ARRAY_CONF_H_ #define MIC_ARRAY_CONF_H_ +#include "customdefines.h" + #define MIC_ARRAY_MAX_FRAME_SIZE_LOG2 0 -#define MIC_ARRAY_NUM_MICS 8 +#define MIC_ARRAY_NUM_MICS (NUM_PDM_MICS) #endif /* MIC_ARRAY_CONF_H_ */ diff --git a/module_usb_audio/pdm_mics/pdm_mic.h b/module_usb_audio/pdm_mics/pdm_mic.h deleted file mode 100644 index cf6f0e6d..00000000 --- a/module_usb_audio/pdm_mics/pdm_mic.h +++ /dev/null @@ -1,37 +0,0 @@ - -#include "mic_array.h" - -#ifdef MIC_PROCESSING_USE_INTERFACE -/* Interface based user processing */ -typedef interface mic_process_if -{ - void transfer_buffers(mic_array_frame_time_domain * unsafe audio, int output[]); - void init(); -} mic_process_if; - - -[[combinable]] -void pdm_buffer(streaming chanend c_ds_output[2], chanend c_audio -#ifdef MIC_PROCESSING_USE_INTERFACE - , client mic_process_if i_mic_process -#endif -); - -[[combinable]] -void user_pdm_process(server mic_process_if i_mic_data); - -/* PDM interface and decimation cores */ -void pdm_mic(streaming chanend c_ds_output[2]); - -#else - -/* Simple user hooks/call-backs */ -unsafe void user_pdm_process(mic_array_frame_time_domain * unsafe audio, int output[]); - -void user_pdm_init(); - -/* PDM interface and decimation cores */ -void pdm_mic(streaming chanend c_ds_output[2]); - -#endif -