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

Added XUA_I2S_N_BITS (was N_BITS_I2S) and tidied up usage of define

Browse Source
This commit is contained in:
Ross Owen
2023-06-05 14:24:59 +01:00
parent 5d886487fa
commit b27514fd9a
3 changed files with 94 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib_xua/api/xua_conf_default.h
View File

@@ -193,6 +193,16 @@
#define I2S_DOWNSAMPLE_CHANS_IN I2S_CHANS_ADC #define I2S_DOWNSAMPLE_CHANS_IN I2S_CHANS_ADC
#endif #endif
/**
* @Brief Number of bits per channel for I2S/TDM
*
* Default: 32 bits
*/
#ifndef XUA_I2S_N_BITS
#define XUA_I2S_N_BITS (32)
#endif
/** /**
* @brief Max supported sample frequency for device (Hz). Default: 192000 * @brief Max supported sample frequency for device (Hz). Default: 192000
*/ */

52
lib_xua/src/core/audiohub/audiohub_initport.xc
View File

@@ -39,11 +39,12 @@ void InitPorts_master(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_D
#endif #endif
unsigned tmp; unsigned tmp;
#ifdef N_BITS_I2S
tmp = partout_timestamped(p_lrclk, N_BITS_I2S, 0); if(XUA_I2S_N_BITS == 32)
#else
p_lrclk <: 0 @ tmp; p_lrclk <: 0 @ tmp;
#endif else
tmp = partout_timestamped(p_lrclk, XUA_I2S_N_BITS, 0);
tmp += 100; tmp += 100;
/* Since BCLK is free-running, setup outputs/inputs at a known point in the future */ /* Since BCLK is free-running, setup outputs/inputs at a known point in the future */
@@ -51,11 +52,10 @@ void InitPorts_master(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_D
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < I2S_WIRES_DAC; i++) for(int i = 0; i < I2S_WIRES_DAC; i++)
{ {
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS == 32)
partout_timed(p_i2s_dac[i], N_BITS_I2S, 0, tmp);
#else
p_i2s_dac[i] @ tmp <: 0; p_i2s_dac[i] @ tmp <: 0;
#endif else
partout_timed(p_i2s_dac[i], XUA_I2S_N_BITS, 0, tmp);
} }
#endif #endif
unsigned lrClkVal = 0x7FFFFFFF; unsigned lrClkVal = 0x7FFFFFFF;
@@ -64,19 +64,18 @@ void InitPorts_master(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_D
lrClkVal = 0x80000000; lrClkVal = 0x80000000;
} }
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS == 32)
partout_timed(p_lrclk, N_BITS_I2S, lrClkVal, tmp);
#else
p_lrclk @ tmp <: lrClkVal; p_lrclk @ tmp <: lrClkVal;
#endif else
partout_timed(p_lrclk, XUA_I2S_N_BITS, lrClkVal, tmp);
#if (I2S_CHANS_ADC != 0) #if (I2S_CHANS_ADC != 0)
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-1)); asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1));
#ifdef N_BITS_I2S
set_port_shift_count(p_i2s_adc[i], N_BITS_I2S); if(XUA_I2S_N_BITS != 32)
#endif set_port_shift_count(p_i2s_adc[i], XUA_I2S_N_BITS);
} }
#endif #endif
#endif /* (I2S_CHANS_ADC != 0 || I2S_CHANS_DAC != 0) */ #endif /* (I2S_CHANS_ADC != 0 || I2S_CHANS_DAC != 0) */
@@ -109,11 +108,7 @@ void InitPorts_slave(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_DI
p_lrclk when pinseq(0) :> void @ tmp; p_lrclk when pinseq(0) :> void @ tmp;
#endif #endif
#ifdef N_BITS_I2S tmp += (I2S_CHANS_PER_FRAME * XUA_I2S_N_BITS) - XUA_I2S_N_BITS + 1 ;
tmp += (I2S_CHANS_PER_FRAME * N_BITS_I2S) - N_BITS_I2S + 1 ;
#else
tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ;
#endif
/* 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 */
@@ -121,11 +116,10 @@ void InitPorts_slave(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_DI
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < I2S_WIRES_DAC; i++) for(int i = 0; i < I2S_WIRES_DAC; i++)
{ {
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS == 32)
partout_timed(p_i2s_dac[i], N_BITS_I2S, 0, tmp-1);
#else
p_i2s_dac[i] @ tmp <: 0; p_i2s_dac[i] @ tmp <: 0;
#endif else
partout_timed(p_i2s_dac[i], XUA_I2S_N_BITS, 0, tmp-1);
} }
#endif #endif
@@ -134,16 +128,14 @@ void InitPorts_slave(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_DI
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-1)); asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1));
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS != 32)
set_port_shift_count(p_i2s_adc[i], N_BITS_I2S); set_port_shift_count(p_i2s_adc[i], XUA_I2S_N_BITS);
#endif
} }
#endif #endif
asm("setpt res[%0], %1"::"r"(p_lrclk),"r"(tmp-1)); asm("setpt res[%0], %1"::"r"(p_lrclk),"r"(tmp-1));
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS != 32)
set_port_shift_count(p_lrclk, N_BITS_I2S); set_port_shift_count(p_lrclk, XUA_I2S_N_BITS);
#endif
#endif /* (I2S_CHANS_ADC != 0 || I2S_CHANS_DAC != 0) */ #endif /* (I2S_CHANS_ADC != 0 || I2S_CHANS_DAC != 0) */
} }
#endif #endif

128
lib_xua/src/core/audiohub/xua_audiohub.xc
View File

@@ -85,14 +85,18 @@ static inline int HandleSampleClock(int frameCount, buffered _XUA_CLK_DIR port:3
#if CODEC_MASTER #if CODEC_MASTER
unsigned syncError = 0; unsigned syncError = 0;
unsigned lrval = 0; unsigned lrval = 0;
const unsigned lrval_mask = 0;
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS != 32)
const unsigned lrval_mask = (0xffffffff << (32 - N_BITS_I2S)); {
lrval_mask = (0xffffffff << (32 - XUA_I2S_N_BITS));
asm volatile("in %0, res[%1]":"=r"(lrval):"r"(p_lrclk):"memory"); asm volatile("in %0, res[%1]":"=r"(lrval):"r"(p_lrclk):"memory");
set_port_shift_count(p_lrclk, N_BITS_I2S); set_port_shift_count(p_lrclk, XUA_I2S_N_BITS);
#else }
else
{
p_lrclk :> lrval; p_lrclk :> lrval;
#endif }
if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM) if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
{ {
@@ -109,61 +113,47 @@ static inline int HandleSampleClock(int frameCount, buffered _XUA_CLK_DIR port:3
} }
} }
else else
{
if(XUA_I2S_N_BITS == 32)
{ {
if(frameCount == 0) if(frameCount == 0)
{ syncError = (lrval != 0x80000000);
#ifdef N_BITS_I2S else
if ((lrval & lrval_mask) != 0x80000000) syncError = (lrval != 0x7FFFFFFF);
{
syncError = 1;
} }
#else
syncError += (lrval != 0x80000000);
}
#endif
else else
{ {
#ifdef N_BITS_I2S if(frameCount == 0)
if ((lrval | (~lrval_mask)) != 0x7FFFFFFF) syncError = ((lrval & lrval_mask) != 0x80000000)
{ else
syncError = 1; syncError = ((lrval | (~lrval_mask)) != 0x7FFFFFFF)
}
#else
syncError += (lrval != 0x7FFFFFFF);
#endif
} }
} }
return syncError; return syncError;
#else #else
unsigned clkVal;
if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM) if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
{ {
if(frameCount == (I2S_CHANS_PER_FRAME-1)) if(frameCount == (I2S_CHANS_PER_FRAME-1))
p_lrclk <: 0x80000000; clkVal = 0x80000000;
else else
p_lrclk <: 0x00000000; clkVal = 0x00000000;
} }
else else
{ {
if(frameCount == 0) if(frameCount == 0)
{ clkVal = 0x80000000;
#ifdef N_BITS_I2S
partout(p_lrclk, N_BITS_I2S, 0x80000000 >> (32 - N_BITS_I2S));
#else
p_lrclk <: 0x80000000;
#endif
}
else else
{ clkVal = 0x7fffffff;
#ifdef N_BITS_I2S
partout(p_lrclk, N_BITS_I2S, 0x7fffffff >> (32 - N_BITS_I2S));
#else
p_lrclk <: 0x7fffffff;
#endif
}
} }
if(XUA_I2S_N_BITS == 32)
p_lrclk <: clkVal;
else
partout(p_lrclk, XUA_I2S_N_BITS, clkVal >> (32 - XUA_I2S_N_BITS));
return 0; return 0;
#endif #endif
@@ -317,16 +307,16 @@ unsigned static AudioHub_MainLoop(chanend ?c_out, chanend ?c_spd_out
// 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)
unsigned sample; unsigned sample;
asm volatile("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index])); asm volatile("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index]));
#ifdef N_BITS_I2S
set_port_shift_count(p_i2s_adc[index], N_BITS_I2S);
sample = bitrev(sample) << (32 - N_BITS_I2S);
#else
sample = bitrev(sample);
#endif
sample = bitrev(sample);
if(XUA_I2S_N_BITS != 32)
{
set_port_shift_count(p_i2s_adc[index], XUA_I2S_N_BITS);
sample <<= (32 - XUA_I2S_N_BITS);
}
index++; index++;
int chanIndex = ((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i; // channels 0, 2, 4.. on each line. int chanIndex = ((frameCount-2) & (I2S_CHANS_PER_FRAME-1)) + i; // channels 0, 2, 4.. on each line.
#if (AUD_TO_USB_RATIO > 1) #if (AUD_TO_USB_RATIO > 1)
if ((AUD_TO_USB_RATIO - 1) == audioToUsbRatioCounter) if ((AUD_TO_USB_RATIO - 1) == audioToUsbRatioCounter)
@@ -378,12 +368,10 @@ unsigned static AudioHub_MainLoop(chanend ?c_out, chanend ?c_spd_out
src_ff3v_fir_coefs[2-audioToUsbRatioCounter]); src_ff3v_fir_coefs[2-audioToUsbRatioCounter]);
} }
#endif /* (AUD_TO_USB_RATIO > 1) */ #endif /* (AUD_TO_USB_RATIO > 1) */
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS == 32)
partout(p_i2s_dac[index++], N_BITS_I2S, bitrev(samplesOut[frameCount +i]));
#else
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]); p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]);
#endif else
partout(p_i2s_dac[index++], XUA_I2S_N_BITS, bitrev(samplesOut[frameCount +i]));
} }
#endif // (I2S_CHANS_DAC != 0) #endif // (I2S_CHANS_DAC != 0)
@@ -457,13 +445,12 @@ unsigned static AudioHub_MainLoop(chanend ?c_out, chanend ?c_spd_out
/* 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) */
unsigned sample; unsigned sample;
asm volatile("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index])); asm volatile("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index]));
#ifdef N_BITS_I2S
set_port_shift_count(p_i2s_adc[index], N_BITS_I2S);
sample = bitrev(sample) << (32 - N_BITS_I2S);
#else
sample = bitrev(sample); sample = bitrev(sample);
#endif if(XUA_I2S_N_BITS != 32)
{
set_port_shift_count(p_i2s_adc[index], XUA_I2S_N_BITS);
sample = bitrev(sample) << (32 - XUA_I2S_N_BITS);
}
index++; index++;
int chanIndex = ((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i; // channels 1, 3, 5.. on each line. int chanIndex = ((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i; // channels 1, 3, 5.. on each line.
@@ -515,12 +502,10 @@ unsigned static AudioHub_MainLoop(chanend ?c_out, chanend ?c_spd_out
src_ff3v_fir_coefs[2-audioToUsbRatioCounter]); src_ff3v_fir_coefs[2-audioToUsbRatioCounter]);
} }
#endif /* (AUD_TO_USB_RATIO > 1) */ #endif /* (AUD_TO_USB_RATIO > 1) */
#ifdef N_BITS_I2S if(XUA_I2S_N_BITS == 32)
partout(p_i2s_dac[index++], N_BITS_I2S, bitrev(samplesOut[frameCount + i]));
#else
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]); p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]);
#endif else
partout(p_i2s_dac[index++], XUA_I2S_N_BITS, bitrev(samplesOut[frameCount + i]));
} }
#endif // (I2S_CHANS_DAC != 0) #endif // (I2S_CHANS_DAC != 0)
@@ -731,22 +716,13 @@ void XUA_AudioHub(chanend ?c_aud, clock ?clk_audio_mclk, clock ?clk_audio_bclk,
/* Calculate master clock to bit clock (or DSD clock) divide for current sample freq /* Calculate master clock to bit clock (or DSD clock) divide for current sample freq
* e.g. 11.289600 / (176400 * 64) = 1 */ * e.g. 11.289600 / (176400 * 64) = 1 */
{ {
#if (XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM) unsigned numBits = XUA_I2S_N_BITS * 2;
/* I2S has 32 bits per sample. *8 as 8 channels */
unsigned numBits = 256;
#if N_BITS_I2S != 32 if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
#error TDM mode only supports 32 bclks per sample {
#endif /* TDM has 8 channels */
numBits *= 4;
#else }
#ifndef N_BITS_I2S
/* I2S has 32 bits per sample. *2 as 2 channels */
unsigned numBits = 2 * 32;
#else
unsigned numBits = 2 * N_BITS_I2S;
#endif
#endif
#if (DSD_CHANS_DAC > 0) #if (DSD_CHANS_DAC > 0)
if(dsdMode == DSD_MODE_DOP) if(dsdMode == DSD_MODE_DOP)