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

Remove DSD from slave

Browse Source
This commit is contained in:
Ed Clarke
2017-12-27 14:42:47 +00:00
parent f4a5501d98
commit 573b7f3b0c
1 changed files with 155 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1007,13 +1007,6 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
int firstIteration = 1; int firstIteration = 1;
unsigned dsdMarker = DSD_MARKER_2; /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */
int dsdCount = 0;
#if (DSD_CHANS_DAC != 0)
int everyOther = 1;
unsigned dsdSample_l = 0x96960000;
unsigned dsdSample_r = 0x96960000;
#endif
unsigned underflowWord = 0; unsigned underflowWord = 0;
unsigned frameCount = 0; unsigned frameCount = 0;
@@ -1021,17 +1014,6 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
adatCounter = 0; adatCounter = 0;
#endif #endif
#if(DSD_CHANS_DAC != 0)
if(dsdMode == DSD_MODE_DOP)
{
underflowWord = 0xFA969600;
}
else if(dsdMode == DSD_MODE_NATIVE)
{
underflowWord = 0x96969696;
}
#endif
unsigned audioToUsbRatioCounter = 0; unsigned audioToUsbRatioCounter = 0;
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
unsigned audioToMicsRatioCounter = 0; unsigned audioToMicsRatioCounter = 0;
@@ -1108,12 +1090,6 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
while (!syncError) while (!syncError)
{ {
#if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
if(dsdMode == DSD_MODE_NATIVE) do_dsd_native(samplesOut, dsdSample_l, dsdSample_r, divide);
else if(dsdMode == DSD_MODE_DOP) do_dsp_dop(everyOther, samplesOut, dsdSample_l, dsdSample_r, divide);
else
#endif
{
#if (I2S_CHANS_ADC != 0) #if (I2S_CHANS_ADC != 0)
#if (AUD_TO_USB_RATIO > 1) #if (AUD_TO_USB_RATIO > 1)
if (0 == audioToUsbRatioCounter) if (0 == audioToUsbRatioCounter)
@@ -1330,8 +1306,6 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
} }
#endif // (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #endif // (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
} // !dsdMode
do_dsd_dop_check(dsdMode, dsdCount, curSamFreq, samplesOut, dsdMarker);
#ifdef I2S_MODE_TDM #ifdef I2S_MODE_TDM
/* Increase frameCount by 2 since we have output two channels (per data line) */ /* Increase frameCount by 2 since we have output two channels (per data line) */