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

Improving clicks entering/leaving DoP mode

Browse Source
This commit is contained in:
Ross Owen
2013-09-05 23:18:34 +01:00
parent 439ec036fb
commit 04dd2a2a05
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
module_usb_audio/audio.xc
View File

@@ -11,7 +11,6 @@
#include <platform.h> #include <platform.h>
#include <xs1.h> #include <xs1.h>
#include <xclib.h> #include <xclib.h>
#include <print.h>
#include <xs1_su.h> #include <xs1_su.h>
#include "devicedefines.h" #include "devicedefines.h"
@@ -19,6 +18,8 @@
#include "audiohw.h" #include "audiohw.h"
#include "SpdifTransmit.h" #include "SpdifTransmit.h"
#include "clockcmds.h" #include "clockcmds.h"
#include "xc_ptr.h"
unsigned testsamples[100]; unsigned testsamples[100];
int p = 0; int p = 0;
unsigned lastSample =0; unsigned lastSample =0;
@@ -104,10 +105,10 @@ extern void device_reboot(void);
unsigned dsdMarker = DSD_MARKER_2; /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */ unsigned dsdMarker = DSD_MARKER_2; /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */
int dsdCount = 0; int dsdCount = 0;
int everyOther = 1; int everyOther = 1;
unsigned dsdSample_l = 0; unsigned dsdSample_l = 0x69696969;
unsigned dsdSample_r = 0; unsigned dsdSample_r = 0x69696969;
#endif #endif
int counter = 0;
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0
for (int i=0;i<NUM_USB_CHAN_IN;i++) for (int i=0;i<NUM_USB_CHAN_IN;i++)
@@ -289,6 +290,7 @@ extern void device_reboot(void);
{ {
outuint(c_out, 0); outuint(c_out, 0);
/* Check for sample freq change (or other command) or new samples from mixer*/ /* Check for sample freq change (or other command) or new samples from mixer*/
if(testct(c_out)) if(testct(c_out))
{ {
@@ -310,7 +312,7 @@ extern void device_reboot(void);
{ {
#ifndef MIXER // Interfaces straight to decouple() #ifndef MIXER // Interfaces straight to decouple()
(void) inuint(c_out); (void) inuint(c_out);
counter++;
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_IN; i++) for(int i = 0; i < NUM_USB_CHAN_IN; i++)
@@ -379,25 +381,6 @@ extern void device_reboot(void);
dsdSample_r = bitrev(byterev(dsdSample_r)); dsdSample_r = bitrev(byterev(dsdSample_r));
dsdSample_l = bitrev(byterev(dsdSample_l)); dsdSample_l = bitrev(byterev(dsdSample_l));
//if(dsdSample_l != 0)
//testsamples[p++] = dsdSample_l;
//if(p > 20)
//for (int i = 0; i < 20; i++)
// printhexln(testsamples[i]);
//if(lastSample+1 != dsdSample_l)
//{
// printhexln(lastSample);
//}
//lastSample = dsdSample_l;
// Output 32 clocks DSD to all
//p_dsd_dac[0] <: bitrev(dsdSample_l);
//p_dsd_dac[1] <: bitrev(dsdSample_r);
switch (divide*2) switch (divide*2)
{ {
case 8: case 8:
@@ -704,22 +687,20 @@ extern void device_reboot(void);
dsdMarker = DSD_MARKER_2; dsdMarker = DSD_MARKER_2;
} }
} }
else if(dsdMode == DSD_MODE_DOP) // DSD Mode else if(dsdMode == DSD_MODE_DOP) // DSD DoP Mode
{ {
/* If we are running in DOP mode, check if we need to come out */ /* If we are running in DOP mode, check if we need to come out */
if((DSD_MASK(samplesOut[0]) != dsdMarker) && (DSD_MASK(samplesOut[1]) != dsdMarker)) if((DSD_MASK(samplesOut[0]) != DSD_MARKER_1) && (DSD_MASK(samplesOut[1]) != DSD_MARKER_1))
{ {
if(!((dsdCount == 0) && (DSD_MASK(samplesOut[0]) == (dsdMarker ^DSD_MARKER_XOR)) if((DSD_MASK(samplesOut[0]) != DSD_MARKER_2) && (DSD_MASK(samplesOut[1]) != DSD_MARKER_2))
&& (DSD_MASK(samplesOut[1]) == (dsdMarker ^ DSD_MARKER_XOR))))
{ {
dsdCount = 0;
dsdMode = 0; dsdMode = 0;
// Set clocks low
p_dsd_clk <: 0; p_dsd_clk <: 0;
return {0,0}; return {0,0};
} }
} }
} }
#endif #endif
} }
@@ -849,8 +830,6 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c)
/* Calculate divide required for bit clock e.g. 11.289600 / (176400 * 64) = 1 */ /* Calculate divide required for bit clock e.g. 11.289600 / (176400 * 64) = 1 */
divide = mClk / ( curSamFreq * 64 ); divide = mClk / ( curSamFreq * 64 );
/* Configure Clocking/CODEC/DAC/ADC for SampleFreq/MClk */
AudioHwConfig(curSamFreq, mClk, c_config, dsdMode);
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
/* Configure audio ports */ /* Configure audio ports */
@@ -895,6 +874,8 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c)
#endif #endif
/* Configure Clocking/CODEC/DAC/ADC for SampleFreq/MClk */
AudioHwConfig(curSamFreq, mClk, c_config, dsdMode);
if(!firstRun) if(!firstRun)
{ {
@@ -952,6 +933,11 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c)
* Native = 2 * Native = 2
*/ */
dsdMode = retVal2; dsdMode = retVal2;
//printstrln("set");
}
else
{
//printstrln("err\n");
} }
#else #else