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

Fixed up input only build

Browse Source
This commit is contained in:
Ross Owen
2013-07-09 17:27:45 +01:00
parent 1bd8744dc2
commit e2906b7eb2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_usb_audio/audio.xc
View File

@@ -19,7 +19,7 @@
#include "audiohw.h" #include "audiohw.h"
#include "SpdifTransmit.h" #include "SpdifTransmit.h"
#ifdef DSD_OUTPUT #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;
#endif #endif
@@ -51,7 +51,7 @@ extern in port p_bclk;
#endif #endif
unsigned dsdMode = 0; unsigned dsdMode = 0;
#ifdef DSD_OUTPUT #if (DSD_CHANS_DAC != 0)
#define DSD_MARKER_1 0xFA #define DSD_MARKER_1 0xFA
#define DSD_MARKER_2 0x05 #define DSD_MARKER_2 0x05
#define DSD_MARKER_XOR 0xFF #define DSD_MARKER_XOR 0xFF
@@ -97,7 +97,7 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
int started = 0; int started = 0;
#endif #endif
#ifdef DSD_OUTPUT #if (DSD_CHANS_DAC != 0)
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;
@@ -362,7 +362,7 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
#endif #endif
tmp = 0; tmp = 0;
#if defined(DSD_OUTPUT) && (NUM_USB_CHAN_OUT > 0) #if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
if(dsdMode) if(dsdMode)
{ {
//while(1) //while(1)
@@ -599,7 +599,7 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
#endif #endif
} // !dsdMode } // !dsdMode
#if defined (DSD_OUTPUT) && (NUM_USB_CHAN_OUT > 0) #if (DSD_CHANS_DAC) && (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 */
@@ -774,7 +774,7 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c)
/* Configure Clocking/CODEC/DAC/ADC for SampleFreq/MClk */ /* Configure Clocking/CODEC/DAC/ADC for SampleFreq/MClk */
AudioHwConfig(curSamFreq, mClk, c_config, dsdMode); AudioHwConfig(curSamFreq, mClk, c_config, dsdMode);
#ifdef DSD_OUTPUT #if (DSD_CHANS_DAC != 0)
/* Configure audio ports */ /* Configure audio ports */
ConfigAudioPortsWrapper( ConfigAudioPortsWrapper(
#if (I2S_CHANS_DAC != 0) #if (I2S_CHANS_DAC != 0)
@@ -869,7 +869,7 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c)
//else //else
//p_bclk <: 0; //p_bclk <: 0;
#ifdef DSD_OUTPUT #if (DSD_CHANS_DAC != 0)
if(retVal == 0) if(retVal == 0)
{ {
// Check DSD mode here.. // Check DSD mode here..

2
module_usb_audio/ports/audioports.c
View File

@@ -6,7 +6,7 @@
#include "devicedefines.h" #include "devicedefines.h"
#include "audioports.h" #include "audioports.h"
#ifdef DSD_OUTPUT #if (DSD_CHANS_DAC != 0)
/* Note since DSD ports could be reused for I2S ports we do all the setup manually in C */ /* Note since DSD ports could be reused for I2S ports we do all the setup manually in C */
#if DSD_CHANS_DAC > 0 #if DSD_CHANS_DAC > 0
port p_dsd_dac[DSD_CHANS_DAC] = { port p_dsd_dac[DSD_CHANS_DAC] = {