Merge branch 'stable' of git://git/apps/sc_usb_audio into stable

This commit is contained in:
Ross Owen
2016-11-16 12:27:28 +00:00
3 changed files with 5 additions and 38 deletions

View File

@@ -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_ */

View File

@@ -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