i_audMan no longer hidden by a define. PDM min transfer uses transaction.

This commit is contained in:
Ross Owen
2016-05-20 14:39:01 +01:00
parent 2514a464a2
commit 5376b5027f
2 changed files with 11 additions and 10 deletions

View File

@@ -283,12 +283,7 @@ static inline unsigned DoSampleTransfer(chanend c_out, const int readBuffNo, con
#else
inuint(c_out);
#endif
UserBufferManagement(samplesOut, samplesIn[readBuffNo]
//#ifdef RUN_DSP_TASK
, i_audMan
//#endif
);
UserBufferManagement(samplesOut, samplesIn[readBuffNo], i_audMan);
#if NUM_USB_CHAN_IN > 0
#pragma loop unroll
@@ -717,11 +712,14 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
#if (NUM_PDM_MICS > 0)
/* Get samples from PDM->PCM comverter */
c_pdm_pcm <: 1;
master
{
#pragma loop unroll
for(int i = 0; i < NUM_PDM_MICS; i++)
{
c_pdm_pcm :> samplesIn[readBuffNo][i];
}
}
#endif
}

View File

@@ -114,13 +114,17 @@ void pdm_buffer(streaming chanend c_ds_output[2], chanend c_audio
select
{
case c_audio :> req:
/* Audio IO core requests samples */
if(req)
unsafe{
for(int i = 0; i < NUM_PDM_MICS; i++)
slave
{
c_audio <: output[i];
#pragma loop unroll
for(int i = 0; i < NUM_PDM_MICS; i++)
{
c_audio <: output[i];
}
}
/* Get a new frame of mic data */
@@ -182,5 +186,4 @@ void pdm_mic(streaming chanend c_ds_output[2])
mic_array_decimate_to_pcm_4ch(c_4x_pdm_mic_1, c_ds_output[1]);
}
}
#endif