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

First cut TDM input

Browse Source
This commit is contained in:
Ross Owen
2014-11-10 18:36:51 +00:00
parent 33d2cbd538
commit 6f0bf1e2e2
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
module_usb_audio/audio.xc
View File

@@ -372,10 +372,10 @@ chanend ?c_adc)
#if NUM_USB_CHAN_OUT > 0 #if NUM_USB_CHAN_OUT > 0
unsigned samplesOut[NUM_USB_CHAN_OUT]; unsigned samplesOut[NUM_USB_CHAN_OUT];
#endif #endif
#if NUM_USB_CHAN_IN > 0 //#if NUM_USB_CHAN_IN > 0
unsigned samplesIn[NUM_USB_CHAN_IN]; unsigned samplesIn[NUM_USB_CHAN_IN];
unsigned samplesInPrev[NUM_USB_CHAN_IN]; unsigned samplesInPrev[NUM_USB_CHAN_IN];
#endif //#endif
unsigned tmp; unsigned tmp;
unsigned index; unsigned index;
#ifdef RAMP_CHECK #ifdef RAMP_CHECK
@@ -554,16 +554,22 @@ chanend ?c_adc)
/* Input previous L sample into L in buffer */ /* Input previous L sample into L in buffer */
index = 0; index = 0;
#pragma loop unroll #pragma loop unroll
#ifdef I2S_MODE_TDM
for(int i = 0; i < I2S_CHANS_ADC; i += 8)
{
asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++]));
samplesIn[(2*tdmCount)+i] = bitrev(sample);
}
#else
for(int i = 0; i < I2S_CHANS_ADC; i += 2) for(int i = 0; i < I2S_CHANS_ADC; i += 2)
{ {
// p_i2s_adc[index++] :> sample; // p_i2s_adc[index++] :> sample;
// Manual IN instruction since compiler generates an extra setc per IN (bug #15256) // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++])); asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++]));
#if NUM_USB_CHAN_IN > 0
samplesIn[i] = bitrev(sample); samplesIn[i] = bitrev(sample);
#endif
} }
#endif #endif
#endif
#ifndef CODEC_MASTER #ifndef CODEC_MASTER
/* LR clock delayed by one clock, This is so MSB is output on the falling edge of BCLK /* LR clock delayed by one clock, This is so MSB is output on the falling edge of BCLK
@@ -632,16 +638,21 @@ chanend ?c_adc)
/* Input previous right ADC sample */ /* Input previous right ADC sample */
index = 0; index = 0;
#pragma loop unroll #pragma loop unroll
#ifdef I2S_MODE_TDM
for(int i = 1; i < I2S_CHANS_ADC; i += 8)
{
asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++]));
samplesIn[(2*tdmCount)+i] = bitrev(sample);
}
#else
for(int i = 1; i < I2S_CHANS_ADC; i += 2) for(int i = 1; i < I2S_CHANS_ADC; i += 2)
{ {
// p_i2s_adc[index++] :> sample; // p_i2s_adc[index++] :> sample;
// Manual IN instruction since compiler generates an extra setc per IN (bug #15256) // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++])); asm("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index++]));
#if NUM_USB_CHAN_IN > 0
samplesIn[i] = bitrev(sample); samplesIn[i] = bitrev(sample);
#endif
} }
#endif
#ifdef SU1_ADC_ENABLE #ifdef SU1_ADC_ENABLE
{ {