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

A more elegant solution to the DSD stop_clock() pausing issue. Just set ALL clocks to 0 before deliver returns

Browse Source
This commit is contained in:
Ross Owen
2013-10-16 19:09:21 +01:00
parent 5f22f37396
commit 6c5253abb0
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module_usb_audio/audio.xc
View File

@@ -325,7 +325,6 @@ extern void device_reboot(void);
p_bclk <: 0; p_bclk <: 0;
#if(DSD_CHANS_DAC != 0) #if(DSD_CHANS_DAC != 0)
/* DSD Clock might not be shared with lrclk or bclk... */ /* DSD Clock might not be shared with lrclk or bclk... */
if(dsdMode)
p_dsd_clk <: 0; p_dsd_clk <: 0;
#endif #endif
command = inct(c_out); command = inct(c_out);
@@ -714,6 +713,7 @@ extern void device_reboot(void);
// Set clocks low // Set clocks low
p_lrclk <: 0; p_lrclk <: 0;
p_bclk <: 0; p_bclk <: 0;
p_dsd_clk <: 0;
return {0,0}; return {0,0};
} }
} }
@@ -731,6 +731,9 @@ 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 = 0;
// Set clocks low
p_lrclk <: 0;
p_bclk <: 0;
p_dsd_clk <: 0; p_dsd_clk <: 0;
return {0,0}; return {0,0};
} }

16
module_usb_audio/ports/audioports.xc
View File

@@ -32,16 +32,7 @@ unsigned int divide)
{ {
#ifndef CODEC_MASTER #ifndef CODEC_MASTER
/* Output 0 on BCLK to ensure clock is low #if 0
* Required as stop_clock will only complete when the clock is low
*/
// configure_out_port_no_ready(p_bclk, clk_audio_mclk, 0);
// p_bclk <: 0;
/* Stop_clock() will not complete if the source to the clock-block is not low
* since we are switching between DSD and I2S we grab the source from the clock
* -block and set it low
*/
{ {
unsigned clockResId; unsigned clockResId;
unsigned portResId; unsigned portResId;
@@ -50,6 +41,11 @@ unsigned int divide)
if(portResId !=1) if(portResId !=1)
asm("out res[%0], %1":: "r"(portResId), "r"(0)); asm("out res[%0], %1":: "r"(portResId), "r"(0));
} }
#endif
/* Note this call to stop_clock() will pause forever if the port clocking the clock-block is not low.
* deliver() should return with this being the case - however, if you are having trouble the code
* above can be enabled */
stop_clock(clk_audio_bclk); stop_clock(clk_audio_bclk);
if(!isnull(p_lrclk)) if(!isnull(p_lrclk))