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

Tidy up clockcmds header

Browse Source
This commit is contained in:
Ross Owen
2013-10-23 17:20:16 +01:00
parent 538f6f3bf3
commit f0f9c1ecdb
7 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module_usb_audio/audio.xc
View File

@@ -17,7 +17,7 @@
#include "audioports.h" #include "audioports.h"
#include "audiohw.h" #include "audiohw.h"
#include "SpdifTransmit.h" #include "SpdifTransmit.h"
#include "clockcmds.h" #include "commands.h"
#include "xc_ptr.h" #include "xc_ptr.h"
unsigned testsamples[100]; unsigned testsamples[100];
@@ -54,14 +54,11 @@ extern in port p_lrclk;
extern in port p_bclk; extern in port p_bclk;
#endif #endif
unsigned dsdMode = 0;
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
/* DoP defines */
#define DSD_MARKER_1 0xFA unsigned dsdMode = 0;
#define DSD_MARKER_2 0x05
#define DSD_MARKER_XOR 0xFF
#define DSD_EN_THRESH 32 /* Number of consecutive DSD markers before switching to DSD mode */
#define DSD_MASK(x) ((x >> 24) & 0xff)
#endif #endif

5
module_usb_audio/clocking/clockgen.xc
View File

@@ -4,7 +4,7 @@
#include <print.h> #include <print.h>
#include "devicedefines.h" #include "devicedefines.h"
#include "clockcmds.h" #include "commands.h"
#include "SpdifReceive.h" #include "SpdifReceive.h"
@@ -537,9 +537,6 @@ void clockGen (streaming chanend c_spdif_rx, chanend c_adat_rx, out port p, chan
break; break;
} }
spdifCounters.samples += 1; spdifCounters.samples += 1;
if(clkMode == CLOCK_SPDIF && clockValid[CLOCK_SPDIF_INDEX]) if(clkMode == CLOCK_SPDIF && clockValid[CLOCK_SPDIF_INDEX])

6
module_usb_audio/clockcmds.h → module_usb_audio/commands.h
View File

@@ -25,11 +25,9 @@
#define SET_SAMPLE_FREQ 4 #define SET_SAMPLE_FREQ 4
#define SET_CHAN_COUNT_IN 5 #define SET_CHAN_COUNT_IN 5
#define SET_CHAN_COUNT_OUT 6 #define SET_CHAN_COUNT_OUT 6
#define SET_DSD_MODE 7 #define SET_DSD_MODE 7
#define DSD_MODE_OFF 0
#define DSD_MODE_DOP 1 #include "dsd.h"
#define DSD_MODE_NATIVE 2

2
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -10,7 +10,7 @@
#include "usbaudio10.h" #include "usbaudio10.h"
#include "dbcalc.h" #include "dbcalc.h"
#include "devicedefines.h" #include "devicedefines.h"
#include "clockcmds.h" #include "commands.h"
#include "xc_ptr.h" #include "xc_ptr.h"
#ifdef MIXER #ifdef MIXER
#include "mixer.h" #include "mixer.h"

2
module_usb_audio/endpoint0/endpoint0.xc
View File

@@ -14,7 +14,7 @@
#include "devicedefines.h" #include "devicedefines.h"
#include "usb_device.h" /* Standard descriptor requests */ #include "usb_device.h" /* Standard descriptor requests */
#include "descriptors.h" /* This devices descriptors */ #include "descriptors.h" /* This devices descriptors */
#include "clockcmds.h" #include "commands.h"
#include "audiostream.h" #include "audiostream.h"
#include "hostactive.h" #include "hostactive.h"
#include "vendorrequests.h" #include "vendorrequests.h"

2
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -2,7 +2,7 @@
#include "xc_ptr.h" #include "xc_ptr.h"
#include "devicedefines.h" #include "devicedefines.h"
#include "interrupt.h" #include "interrupt.h"
#include "clockcmds.h" #include "commands.h"
#include "xud.h" #include "xud.h"
#include "usb.h" #include "usb.h"
#ifdef HID_CONTROLS #ifdef HID_CONTROLS

2
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -9,7 +9,7 @@
#include "iAP.h" #include "iAP.h"
#endif #endif
#include "xc_ptr.h" #include "xc_ptr.h"
#include "clockcmds.h" #include "commands.h"
#include "xud.h" #include "xud.h"
#include "testct_byref.h" #include "testct_byref.h"