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

Fixing up build issues related to dsdMode

Browse Source
This commit is contained in:
Ross Owen
2013-10-24 10:50:44 +01:00
parent f0f9c1ecdb
commit 60c04400ac
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module_usb_audio/audio.xc
View File

@@ -22,7 +22,7 @@
unsigned testsamples[100]; unsigned testsamples[100];
int p = 0; int p = 0;
unsigned lastSample =0; unsigned lastSample = 0;
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
extern unsigned p_dsd_dac[DSD_CHANS_DAC]; extern unsigned p_dsd_dac[DSD_CHANS_DAC];
extern port p_dsd_clk; extern port p_dsd_clk;
@@ -54,13 +54,7 @@ extern in port p_lrclk;
extern in port p_bclk; extern in port p_bclk;
#endif #endif
#if (DSD_CHANS_DAC != 0) DsdMode dsdMode = DSD_MODE_OFF;
unsigned dsdMode = 0;
#endif
/* Master clock input */ /* Master clock input */
extern port p_mclk_in; extern port p_mclk_in;
@@ -132,8 +126,10 @@ extern void device_reboot(void);
if(testct(c_out)) if(testct(c_out))
{ {
unsigned command = inct(c_out); unsigned command = inct(c_out);
#if (DSD_CHANS_DAC > 0)
if(dsdMode == DSD_MODE_DOP) if(dsdMode == DSD_MODE_DOP)
dsdMode = 0; dsdMode = DSD_MODE_OFF;
#endif
return {command, inuint(c_out)}; return {command, inuint(c_out)};
} }
else else
@@ -188,8 +184,10 @@ extern void device_reboot(void);
#ifndef CODEC_MASTER #ifndef CODEC_MASTER
if(!dsdMode) #if (DSD_CHANS_DAC > 0)
if(dsdMode == DSD_MODE_OFF)
{ {
#endif
/* Clear I2S port buffers */ /* Clear I2S port buffers */
clearbuf(p_lrclk); clearbuf(p_lrclk);
@@ -275,7 +273,9 @@ extern void device_reboot(void);
break; break;
} }
} }
#if (DSD_CHANS_DAC > 0)
} /* if (!dsdMode) */ } /* if (!dsdMode) */
#endif
#else #else
/* CODEC is master */ /* CODEC is master */
/* Wait for LRCLK edge */ /* Wait for LRCLK edge */
@@ -326,8 +326,11 @@ extern void device_reboot(void);
p_dsd_clk <: 0; p_dsd_clk <: 0;
#endif #endif
command = inct(c_out); command = inct(c_out);
#if (DSD_CHANS_DAC > 0)
if(dsdMode == DSD_MODE_DOP) if(dsdMode == DSD_MODE_DOP)
dsdMode = 0; dsdMode = DSD_MODE_OFF;
#endif
return {command, inuint(c_out)}; return {command, inuint(c_out)};
} }
@@ -529,7 +532,6 @@ extern void device_reboot(void);
#endif #endif
{ {
#pragma xta endpoint "i2s_output_l" #pragma xta endpoint "i2s_output_l"
#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0) #if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
@@ -697,7 +699,7 @@ extern void device_reboot(void);
#if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0) #if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
/* Check for DSD */ /* Check for DSD */
/* Currently we only check on channel 0 - we get all 0's on channels without data */ /* Currently we only check on channel 0 - we get all 0's on channels without data */
if(!dsdMode) if(dsdMode == DSD_MODE_OFF)
{ {
if((DSD_MASK(samplesOut[0]) == dsdMarker) && (DSD_MASK(samplesOut[1]) == dsdMarker)) if((DSD_MASK(samplesOut[0]) == dsdMarker) && (DSD_MASK(samplesOut[1]) == dsdMarker))
{ {
@@ -729,7 +731,7 @@ extern void device_reboot(void);
{ {
if((DSD_MASK(samplesOut[0]) != DSD_MARKER_2) && (DSD_MASK(samplesOut[1]) != DSD_MARKER_2)) if((DSD_MASK(samplesOut[0]) != DSD_MARKER_2) && (DSD_MASK(samplesOut[1]) != DSD_MARKER_2))
{ {
dsdMode = 0; dsdMode = DSD_MODE_OFF;
// Set clocks low // Set clocks low
p_lrclk <: 0; p_lrclk <: 0;
p_bclk <: 0; p_bclk <: 0;