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

Merge branch 'master' of git://git/apps/sc_usb_audio

Browse Source
This commit is contained in:
Andrew Stanford-Jason
2016-02-24 10:17:31 +00:00
parent 6974636bc4 431c7f5db9
commit 1559d36153
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@@ -1,6 +1,11 @@
sc_usb_audio Change Log sc_usb_audio Change Log
======================= =======================
6.15.1
------
- RESOLVED: DAC data mis-alignment issue in TDM slave mode
6.15.0 6.15.0
------ ------
- CHANGE: Removed 32kHz sample-rate support when PDM microphones enabled (lib_mic_array - CHANGE: Removed 32kHz sample-rate support when PDM microphones enabled (lib_mic_array

6
module_usb_audio/audio.xc
View File

@@ -407,7 +407,7 @@ static inline void InitPorts(unsigned divide)
tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ; tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ;
/* E.g. 2 * 32 - 32 + 1 = 33 for stereo */ /* E.g. 2 * 32 - 32 + 1 = 33 for stereo */
/* E..g 8 * 32 - 32 + 1 = 225 for 8 chan TDM */ /* E.g. 8 * 32 - 32 + 1 = 225 for 8 chan TDM */
#if (I2S_CHANS_DAC != 0) #if (I2S_CHANS_DAC != 0)
#pragma loop unroll #pragma loop unroll
@@ -421,7 +421,7 @@ static inline void InitPorts(unsigned divide)
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < I2S_WIRES_ADC; i++) for(int i = 0; i < I2S_WIRES_ADC; i++)
{ {
asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp+31)); asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1));
} }
#endif #endif
#endif #endif
@@ -656,7 +656,7 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
/* Output "even" channel to DAC (i.e. left) */ /* Output "even" channel to DAC (i.e. left) */
for(int i = 0; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME) for(int i = 0; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
{ {
p_i2s_dac[index++] <: bitrev(samplesOut[(frameCount)+i]); p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]);
} }
#endif #endif

3
xpd.xml
View File

@@ -96,7 +96,8 @@
<release parenthash = "b279a2ec4c2c8f3dad6624e5c55e2d487be202a8" version = "6.13.0beta2" githash = "55f20f68aef5887daab829d3bea5eb6d5fadecab"></release> <release parenthash = "b279a2ec4c2c8f3dad6624e5c55e2d487be202a8" version = "6.13.0beta2" githash = "55f20f68aef5887daab829d3bea5eb6d5fadecab"></release>
<release parenthash = "176cbeae28523b682ccdd7d92246edea0346634f" version = "6.14.0beta0" githash = "71dc9002456c5cdb6ae4a37887abaa8c3d08b5db"></release> <release parenthash = "176cbeae28523b682ccdd7d92246edea0346634f" version = "6.14.0beta0" githash = "71dc9002456c5cdb6ae4a37887abaa8c3d08b5db"></release>
<release parenthash = "348fead68f7eec1c26df13241c0f96397cff2c08" version = "6.14.0beta1" githash = "caed924d76ce9cd4e9c4febe9bd1ef7b598a04ee"></release> <release parenthash = "348fead68f7eec1c26df13241c0f96397cff2c08" version = "6.14.0beta1" githash = "caed924d76ce9cd4e9c4febe9bd1ef7b598a04ee"></release>
<release parenthash = "cfeb352d625de3d9e4208f8a32ed7b6c8974b024" version = "6.14.0beta2"></release> <release parenthash = "cfeb352d625de3d9e4208f8a32ed7b6c8974b024" version = "6.14.0beta2" githash = "216e8e3eee733c93d288826745850efbb3ebc4aa"></release>
<release parenthash = "929437e7df13732b917c4bedc8f74166840c08b7" version = "6.14.1beta0"></release>
<subpartnumber>XM-004720-SM</subpartnumber> <subpartnumber>XM-004720-SM</subpartnumber>
<vendor>XMOS</vendor> <vendor>XMOS</vendor>
<version_defines> <version_defines>