laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

pcm_pdm_mic() no longer unsafe.. seems to break [[distribute]]

Browse Source
This commit is contained in:
Ross Owen
2016-04-13 20:56:41 +01:00
parent e39f95fcd9
commit 89e7ed5d4f
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module_usb_audio/pdm_mics/pcm_pdm_mic.h
View File

@@ -1,8 +1,6 @@
#include "mic_array.h" #include "mic_array.h"
void pcm_pdm_mic(chanend c_pcm_out);
#ifdef MIC_PROCESSING_USE_INTERFACE #ifdef MIC_PROCESSING_USE_INTERFACE
/* Interface based user processing */ /* Interface based user processing */
typedef interface mic_process_if typedef interface mic_process_if
@@ -15,7 +13,9 @@ typedef interface mic_process_if
} mic_process_if; } mic_process_if;
[[distributable]] [[distributable]]
unsafe void user_pdm_process(server mic_process_if i_mic_data); void user_pdm_process(server mic_process_if i_mic_data);
void pcm_pdm_mic(chanend c_pcm_out, client mic_process_if i_mic_process);
#else #else
@@ -24,6 +24,7 @@ unsafe void user_pdm_process(mic_array_frame_time_domain * unsafe audio, int out
void user_pdm_init(); void user_pdm_init();
void pcm_pdm_mic(chanend c_pcm_out);
#endif #endif

17
module_usb_audio/pdm_mics/pcm_pdm_mic.xc
View File

@@ -97,15 +97,15 @@ void pdm_process(streaming chanend c_ds_output[2], chanend c_audio
#error MAX_FREQ > 48000 NOT CURRENTLY SUPPORTED #error MAX_FREQ > 48000 NOT CURRENTLY SUPPORTED
#endif #endif
void pcm_pdm_mic(chanend c_pcm_out) void pcm_pdm_mic(chanend c_pcm_out
#ifdef MIC_PROCESSING_USE_INTERFACE
, client mic_process_if i_mic_process
#endif
)
{ {
streaming chan c_4x_pdm_mic_0, c_4x_pdm_mic_1; streaming chan c_4x_pdm_mic_0, c_4x_pdm_mic_1;
streaming chan c_ds_output[2]; streaming chan c_ds_output[2];
#ifdef MIC_PROCESSING_USE_INTERFACE
interface mic_process_if i_mic_process;
#endif
/* Note, this divide should be based on master clock freq */ /* Note, this divide should be based on master clock freq */
configure_clock_src_divide(pdmclk, p_mclk, 2); configure_clock_src_divide(pdmclk, p_mclk, 2);
configure_port_clock_output(p_pdm_clk, pdmclk); configure_port_clock_output(p_pdm_clk, pdmclk);
@@ -119,9 +119,10 @@ void pcm_pdm_mic(chanend c_pcm_out)
mic_array_decimate_to_pcm_4ch(c_4x_pdm_mic_1, c_ds_output[1]); mic_array_decimate_to_pcm_4ch(c_4x_pdm_mic_1, c_ds_output[1]);
#ifdef MIC_PROCESSING_USE_INTERFACE #ifdef MIC_PROCESSING_USE_INTERFACE
pdm_process(c_ds_output, c_pcm_out, i_mic_process); pdm_process(c_ds_output, c_pcm_out, i_mic_process);
unsafe{ //unsafe{
user_pdm_process(i_mic_process); //user_pdm_process(i_mic_process);
} //}
/* note user pdm process is included in main.xc to allow maximum flexibilty for customisation */
#else #else
pdm_process(c_ds_output, c_pcm_out); pdm_process(c_ds_output, c_pcm_out);
#endif #endif