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

Tidy up ADAT_RX and SPDIF_RX usage (ifdef vs if)

Browse Source
This commit is contained in:
xross
2018-02-27 14:59:58 +00:00
parent db68680ebf
commit 90aa19d351
10 changed files with 179 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_xua/api/xua_audiohub.h
View File

@@ -26,7 +26,7 @@ void XUA_AudioHub(chanend ?c_aud
#if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
, chanend c_spdif_tx , chanend c_spdif_tx
#endif #endif
#if(defined(SPDIF_RX) || defined(ADAT_RX)) #if((SPDIF_RX) || (ADAT_RX))
, chanend c_dig , chanend c_dig
#endif #endif
#if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1) #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1)

4
lib_xua/api/xua_buffer.h
View File

@@ -51,7 +51,7 @@ void XUA_Buffer(
chanend c_iap_ea_native_data, chanend c_iap_ea_native_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
chanend ?c_int, chanend ?c_int,
chanend ?c_clk_int, chanend ?c_clk_int,
#endif #endif
@@ -90,7 +90,7 @@ void XUA_Buffer_Ep(chanend c_aud_out,
chanend c_iap_ea_native_data, chanend c_iap_ea_native_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
chanend ?c_int, chanend ?c_int,
chanend ?c_clk_int, chanend ?c_clk_int,
#endif #endif

21
lib_xua/api/xua_conf_default.h
View File

@@ -347,11 +347,6 @@
#define SPDIF_RX (0) #define SPDIF_RX (0)
#endif #endif
/* Tidy up old SPDIF_RX usage */
#if defined(SPDIF_RX) && (SPDIF_RX == 0)
#undef SPDIF_RX
#endif
/** /**
* @brief Enables ADAT Rx. Default: 0 (Disabled) * @brief Enables ADAT Rx. Default: 0 (Disabled)
*/ */
@@ -359,17 +354,13 @@
#define ADAT_RX (0) #define ADAT_RX (0)
#endif #endif
#if defined(ADAT_RX) && (ADAT_RX == 0)
#undef ADAT_RX
#endif
/** /**
* @brief S/PDIF Rx first channel index, defines which channels S/PDIF will be input on. * @brief S/PDIF Rx first channel index, defines which channels S/PDIF will be input on.
* Note, indexed from 0. * Note, indexed from 0.
* *
* Default: NONE (Must be defined by app when SPDIF_RX enabled) * Default: NONE (Must be defined by app when SPDIF_RX enabled)
*/ */
#if defined (SPDIF_RX) || defined (__DOXYGEN__) #if (SPDIF_RX) || defined (__DOXYGEN__)
#ifndef SPDIF_RX_INDEX #ifndef SPDIF_RX_INDEX
#error SPDIF_RX_INDEX not defined and SPDIF_RX defined #error SPDIF_RX_INDEX not defined and SPDIF_RX defined
#define SPDIF_RX_INDEX 0 /* Default define for doxygen */ #define SPDIF_RX_INDEX 0 /* Default define for doxygen */
@@ -382,7 +373,7 @@
* *
* Default: NONE (Must be defined by app when ADAT_RX enabled) * Default: NONE (Must be defined by app when ADAT_RX enabled)
*/ */
#if defined(ADAT_RX) || defined(__DOXYGEN__) #if (ADAT_RX) || defined(__DOXYGEN__)
#ifndef ADAT_RX_INDEX #ifndef ADAT_RX_INDEX
#error ADAT_RX_INDEX not defined and ADAT_RX defined #error ADAT_RX_INDEX not defined and ADAT_RX defined
#define ADAT_RX_INDEX (0) /* Default define for doxygen */ #define ADAT_RX_INDEX (0) /* Default define for doxygen */
@@ -393,7 +384,7 @@
#endif #endif
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
/* Setup input stream formats for ADAT */ /* Setup input stream formats for ADAT */
#if(MAX_FREQ > 96000) #if(MAX_FREQ > 96000)
@@ -1173,7 +1164,7 @@ enum USBEndpointNumber_In
ENDPOINT_NUMBER_IN_FEEDBACK, ENDPOINT_NUMBER_IN_FEEDBACK,
#endif #endif
ENDPOINT_NUMBER_IN_AUDIO, ENDPOINT_NUMBER_IN_AUDIO,
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
ENDPOINT_NUMBER_IN_INTERRUPT, /* Audio interrupt/status EP */ ENDPOINT_NUMBER_IN_INTERRUPT, /* Audio interrupt/status EP */
#endif #endif
#ifdef MIDI #ifdef MIDI
@@ -1251,9 +1242,9 @@ enum USBEndpointNumber_Out
#endif #endif
/* Length of clock unit/clock-selector units */ /* Length of clock unit/clock-selector units */
#if defined(SPDIF_RX) && defined(ADAT_RX) #if (SPDIF_RX) && (ADAT_RX)
#define NUM_CLOCKS (3) #define NUM_CLOCKS (3)
#elif defined(SPDIF_RX) || defined(ADAT_RX) #elif (SPDIF_RX) || (ADAT_RX)
#define NUM_CLOCKS (2) #define NUM_CLOCKS (2)
#else #else
#define NUM_CLOCKS (1) #define NUM_CLOCKS (1)

42
lib_xua/src/core/audiohub/xua_audiohub.xc
View File

@@ -44,29 +44,11 @@
static unsigned samplesOut[MAX(NUM_USB_CHAN_OUT, I2S_CHANS_DAC)]; static unsigned samplesOut[MAX(NUM_USB_CHAN_OUT, I2S_CHANS_DAC)];
/* TODO Rm me */
#ifndef ADAT_RX
#define ADAT_RX 0
#endif
#ifndef SPDIF_RX
#define SPDIF_RX 0
#endif
/* Two buffers for ADC data to allow for DAC and ADC I2S ports being offset */ /* Two buffers for ADC data to allow for DAC and ADC I2S ports being offset */
#define IN_CHAN_COUNT (I2S_CHANS_ADC + NUM_PDM_MICS + (8*ADAT_RX) + (2*SPDIF_RX)) #define IN_CHAN_COUNT (I2S_CHANS_ADC + NUM_PDM_MICS + (8*ADAT_RX) + (2*SPDIF_RX))
static unsigned samplesIn[2][MAX(NUM_USB_CHAN_IN, IN_CHAN_COUNT)]; static unsigned samplesIn[2][MAX(NUM_USB_CHAN_IN, IN_CHAN_COUNT)];
/* TODO Rm me */
#if defined(ADAT_RX) && (ADAT_RX ==0)
#undef ADAT_RX
#endif
#if defined(SPDIF_RX) && (SPDIF_RX ==0)
#undef SPDIF_RX
#endif
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC]; extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC];
extern buffered out port:32 p_dsd_clk; extern buffered out port:32 p_dsd_clk;
@@ -454,7 +436,7 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
, unsigned adatSmuxMode , unsigned adatSmuxMode
#endif #endif
, unsigned divide, unsigned curSamFreq , unsigned divide, unsigned curSamFreq
#if(defined(SPDIF_RX) || defined(ADAT_RX)) #if( (SPDIF_RX==1) || (ADAT_RX == 1))
, chanend c_dig_rx , chanend c_dig_rx
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -654,17 +636,17 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
if(frameCount == 0) if(frameCount == 0)
{ {
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX == 1) || (ADAT_RX == 1)
/* Sync with clockgen */ /* Sync with clockgen */
inuint(c_dig_rx); inuint(c_dig_rx);
/* Note, digi-data we just store in samplesIn[readBuffNo] - we only double buffer the I2S input data */ /* Note, digi-data we just store in samplesIn[readBuffNo] - we only double buffer the I2S input data */
#endif #endif
#ifdef SPDIF_RX #if (SPDIF_RX == 1)
asm("ldw %0, dp[g_digData]" :"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 0])); asm("ldw %0, dp[g_digData]" :"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 0]));
asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 1])); asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 1]));
#endif #endif
#ifdef ADAT_RX #if (ADAT_RX == 1)
asm("ldw %0, dp[g_digData+8]" :"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX])); asm("ldw %0, dp[g_digData+8]" :"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX]));
asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 1])); asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 1]));
asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 2])); asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 2]));
@@ -675,7 +657,7 @@ unsigned static deliver_master(chanend ?c_out, chanend ?c_spd_out
asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 7])); asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 7]));
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX == 1) || (ADAT_RX == 1)
/* Request digital data (with prefill) */ /* Request digital data (with prefill) */
outuint(c_dig_rx, 0); outuint(c_dig_rx, 0);
#endif #endif
@@ -833,7 +815,7 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
, unsigned adatSmuxMode , unsigned adatSmuxMode
#endif #endif
, unsigned divide, unsigned curSamFreq , unsigned divide, unsigned curSamFreq
#if(defined(SPDIF_RX) || defined(ADAT_RX)) #if(SPDIF_RX == 1) || (ADAT_RX == 1))
, chanend c_dig_rx , chanend c_dig_rx
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)
@@ -1023,17 +1005,17 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
if(frameCount == 0) if(frameCount == 0)
{ {
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX == 1) || (ADAT_RX == 1)
/* Sync with clockgen */ /* Sync with clockgen */
inuint(c_dig_rx); inuint(c_dig_rx);
/* Note, digi-data we just store in samplesIn[readBuffNo] - we only double buffer the I2S input data */ /* Note, digi-data we just store in samplesIn[readBuffNo] - we only double buffer the I2S input data */
#endif #endif
#ifdef SPDIF_RX #if (SPDIF_RX == 1)
asm("ldw %0, dp[g_digData]" :"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 0])); asm("ldw %0, dp[g_digData]" :"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 0]));
asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 1])); asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn[readBuffNo][SPDIF_RX_INDEX + 1]));
#endif #endif
#ifdef ADAT_RX #if (ADAT_RX == 1)
asm("ldw %0, dp[g_digData+8]" :"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX])); asm("ldw %0, dp[g_digData+8]" :"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX]));
asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 1])); asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 1]));
asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 2])); asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 2]));
@@ -1044,7 +1026,7 @@ unsigned static deliver_slave(chanend ?c_out, chanend ?c_spd_out
asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 7])); asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn[readBuffNo][ADAT_RX_INDEX + 7]));
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX== 1) || (ADAT_RX == 1)
/* Request digital data (with prefill) */ /* Request digital data (with prefill) */
outuint(c_dig_rx, 0); outuint(c_dig_rx, 0);
#endif #endif
@@ -1283,7 +1265,7 @@ void XUA_AudioHub(chanend ?c_mix_out
#if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
, chanend c_spdif_out , chanend c_spdif_out
#endif #endif
#if (defined(ADAT_RX) || defined(SPDIF_RX)) #if ((ADAT_RX == 1) || (SPDIF_RX == 1))
, chanend c_dig_rx , chanend c_dig_rx
#endif #endif
#if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1) #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1)
@@ -1542,7 +1524,7 @@ void XUA_AudioHub(chanend ?c_mix_out
, adatSmuxMode , adatSmuxMode
#endif #endif
, divide, curSamFreq , divide, curSamFreq
#if defined (ADAT_RX) || defined (SPDIF_RX) #if (ADAT_RX == 1) || (SPDIF_RX == 1)
, c_dig_rx , c_dig_rx
#endif #endif
#if (NUM_PDM_MICS > 0) #if (NUM_PDM_MICS > 0)

10
lib_xua/src/core/buffer/ep/ep_buffer.xc
View File

@@ -114,7 +114,7 @@ void XUA_Buffer(
chanend c_iap_ea_native_data, chanend c_iap_ea_native_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
chanend ?c_ep_int, chanend ?c_ep_int,
chanend ?c_clk_int, chanend ?c_clk_int,
#endif #endif
@@ -159,7 +159,7 @@ void XUA_Buffer(
c_ea_data, c_ea_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Audio Interrupt - only used for interrupts on external clock change */ /* Audio Interrupt - only used for interrupts on external clock change */
c_ep_int, c_ep_int,
c_clk_int, c_clk_int,
@@ -217,7 +217,7 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
chanend c_iap_ea_native_data, chanend c_iap_ea_native_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
chanend ?c_ep_int, chanend ?c_ep_int,
chanend ?c_clk_int, chanend ?c_clk_int,
#endif #endif
@@ -257,7 +257,7 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
XUD_ep ep_iap_ea_native_in = XUD_InitEp(c_iap_ea_native_in); XUD_ep ep_iap_ea_native_in = XUD_InitEp(c_iap_ea_native_in);
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
XUD_ep ep_int = XUD_InitEp(c_ep_int); XUD_ep ep_int = XUD_InitEp(c_ep_int);
#endif #endif
@@ -384,7 +384,7 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
/* Wait for response from XUD and service relevant EP */ /* Wait for response from XUD and service relevant EP */
select select
{ {
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Clocking thread wants to produce an interrupt... */ /* Clocking thread wants to produce an interrupt... */
case inuint_byref(c_clk_int, u_tmp): case inuint_byref(c_clk_int, u_tmp):
chkct(c_clk_int, XS1_CT_END); chkct(c_clk_int, XS1_CT_END);

54
lib_xua/src/core/clocking/clockgen.xc
View File

@@ -7,7 +7,7 @@
#include "xua.h" #include "xua.h"
#include "xua_commands.h" #include "xua_commands.h"
#if defined(SPDIF_RX) #if (SPDIF_RX == 1)
#include "SpdifReceive.h" #include "SpdifReceive.h"
#endif #endif
@@ -38,7 +38,7 @@ static int clockInt[NUM_CLOCKS]; /* Interupt flag for
static int clockId[NUM_CLOCKS]; static int clockId[NUM_CLOCKS];
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
static int abs(int x) static int abs(int x)
{ {
if (x < 0) return -x; if (x < 0) return -x;
@@ -73,7 +73,7 @@ static void outInterrupt(chanend c_interruptControl, int value)
void VendorClockValidity(int valid); void VendorClockValidity(int valid);
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
static inline void setClockValidity(chanend c_interruptControl, int clkIndex, int valid, int currentClkMode) static inline void setClockValidity(chanend c_interruptControl, int clkIndex, int valid, int currentClkMode)
{ {
if (clockValid[clkIndex] != valid) if (clockValid[clkIndex] != valid)
@@ -82,13 +82,13 @@ static inline void setClockValidity(chanend c_interruptControl, int clkIndex, in
outInterrupt(c_interruptControl, clockId[clkIndex]); outInterrupt(c_interruptControl, clockId[clkIndex]);
#ifdef CLOCK_VALIDITY_CALL #ifdef CLOCK_VALIDITY_CALL
#ifdef ADAT_RX #if ADAT_RX
if (currentClkMode == CLOCK_ADAT && clkIndex == CLOCK_ADAT_INDEX) if (currentClkMode == CLOCK_ADAT && clkIndex == CLOCK_ADAT_INDEX)
{ {
VendorClockValidity(valid); VendorClockValidity(valid);
} }
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
if (currentClkMode == CLOCK_SPDIF && clkIndex == CLOCK_SPDIF_INDEX) if (currentClkMode == CLOCK_SPDIF && clkIndex == CLOCK_SPDIF_INDEX)
{ {
VendorClockValidity(valid); VendorClockValidity(valid);
@@ -215,11 +215,11 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
unsigned levelTime; unsigned levelTime;
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
timer t_external; timer t_external;
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
/* S/PDIF buffer state */ /* S/PDIF buffer state */
int spdifSamples[MAX_SPDIF_SAMPLES]; /* S/PDIF sample buffer */ int spdifSamples[MAX_SPDIF_SAMPLES]; /* S/PDIF sample buffer */
int spdifWr = 0; /* Write index */ int spdifWr = 0; /* Write index */
@@ -233,7 +233,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
unsigned spdifLeft = 0; unsigned spdifLeft = 0;
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
/* ADAT buffer state */ /* ADAT buffer state */
int adatSamples[MAX_ADAT_SAMPLES]; int adatSamples[MAX_ADAT_SAMPLES];
int adatWr = 0; int adatWr = 0;
@@ -255,7 +255,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
} }
/* Init clock unit state */ /* Init clock unit state */
#ifdef SPDIF_RX #if SPDIF_RX
clockFreq[CLOCK_SPDIF_INDEX] = 0; clockFreq[CLOCK_SPDIF_INDEX] = 0;
clockValid[CLOCK_SPDIF_INDEX] = 0; clockValid[CLOCK_SPDIF_INDEX] = 0;
clockInt[CLOCK_SPDIF_INDEX] = 0; clockInt[CLOCK_SPDIF_INDEX] = 0;
@@ -265,13 +265,13 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
clockId[CLOCK_INTERNAL_INDEX] = ID_CLKSRC_INT; clockId[CLOCK_INTERNAL_INDEX] = ID_CLKSRC_INT;
clockValid[CLOCK_INTERNAL_INDEX] = 0; clockValid[CLOCK_INTERNAL_INDEX] = 0;
clockInt[CLOCK_INTERNAL_INDEX] = 0; clockInt[CLOCK_INTERNAL_INDEX] = 0;
#ifdef ADAT_RX #if ADAT_RX
clockFreq[CLOCK_ADAT_INDEX] = 0; clockFreq[CLOCK_ADAT_INDEX] = 0;
clockInt[CLOCK_ADAT_INDEX] = 0; clockInt[CLOCK_ADAT_INDEX] = 0;
clockValid[CLOCK_ADAT_INDEX] = 0; clockValid[CLOCK_ADAT_INDEX] = 0;
clockId[CLOCK_ADAT_INDEX] = ID_CLKSRC_ADAT; clockId[CLOCK_ADAT_INDEX] = ID_CLKSRC_ADAT;
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
spdifCounters.receivedSamples = 0; spdifCounters.receivedSamples = 0;
spdifCounters.samples = 0; spdifCounters.samples = 0;
spdifCounters.savedSamples = 0; spdifCounters.savedSamples = 0;
@@ -280,7 +280,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
spdifCounters.samplesPerTick = 0; spdifCounters.samplesPerTick = 0;
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
adatCounters.receivedSamples = 0; adatCounters.receivedSamples = 0;
adatCounters.samples = 0; adatCounters.samples = 0;
adatCounters.savedSamples = 0; adatCounters.savedSamples = 0;
@@ -300,7 +300,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
levelTime+= LEVEL_UPDATE_RATE; levelTime+= LEVEL_UPDATE_RATE;
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Fill channel */ /* Fill channel */
outuint(c_dig_rx, 1); outuint(c_dig_rx, 1);
#endif #endif
@@ -379,12 +379,12 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
case CLOCK_INTERNAL: case CLOCK_INTERNAL:
VendorClockValidity(1); VendorClockValidity(1);
break; break;
#ifdef ADAT_RX #if ADAT_RX
case CLOCK_ADAT: case CLOCK_ADAT:
VendorClockValidity(clockValid[CLOCK_ADAT_INDEX]); VendorClockValidity(clockValid[CLOCK_ADAT_INDEX]);
break; break;
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
case CLOCK_SPDIF: case CLOCK_SPDIF:
VendorClockValidity(clockValid[CLOCK_SPDIF_INDEX]); VendorClockValidity(clockValid[CLOCK_SPDIF_INDEX]);
break; break;
@@ -410,7 +410,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
case SET_SMUX: case SET_SMUX:
smux = inuint(c_clk_ctl); smux = inuint(c_clk_ctl);
#ifdef ADAT_RX #if ADAT_RX
adatRd = 0; /* Reset adat FIFO */ adatRd = 0; /* Reset adat FIFO */
adatWr = 0; adatWr = 0;
adatSamps = 0; adatSamps = 0;
@@ -446,14 +446,14 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
/* If we are in an external clock mode and this fire, then clock invalid */ /* If we are in an external clock mode and this fire, then clock invalid */
#ifdef SPDIF_RX #if SPDIF_RX
// if(clkMode == CLOCK_SPDIF) // if(clkMode == CLOCK_SPDIF)
{ {
/* We must have lost valid S/PDIF stream, reset counters, so we dont produce a double edge */ /* We must have lost valid S/PDIF stream, reset counters, so we dont produce a double edge */
spdifCounters.receivedSamples = 0; spdifCounters.receivedSamples = 0;
} }
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
//if(clkMode == CLOCK_ADAT) //if(clkMode == CLOCK_ADAT)
{ {
adatCounters.receivedSamples = 0; adatCounters.receivedSamples = 0;
@@ -470,18 +470,18 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
break; break;
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
case t_external when timerafter(timeNextClockDetection) :> void: case t_external when timerafter(timeNextClockDetection) :> void:
timeNextClockDetection += (LOCAL_CLOCK_INCREMENT); timeNextClockDetection += (LOCAL_CLOCK_INCREMENT);
#ifdef SPDIF_RX #if SPDIF_RX
tmp = spdifCounters.samplesPerTick; tmp = spdifCounters.samplesPerTick;
/* Returns 1 if valid clock found */ /* Returns 1 if valid clock found */
tmp = validSamples(spdifCounters, CLOCK_SPDIF_INDEX); tmp = validSamples(spdifCounters, CLOCK_SPDIF_INDEX);
setClockValidity(c_clk_int, CLOCK_SPDIF_INDEX, tmp, clkMode); setClockValidity(c_clk_int, CLOCK_SPDIF_INDEX, tmp, clkMode);
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
tmp = validSamples(adatCounters, CLOCK_ADAT_INDEX); tmp = validSamples(adatCounters, CLOCK_ADAT_INDEX);
setClockValidity(c_clk_int, CLOCK_ADAT_INDEX, tmp, clkMode); setClockValidity(c_clk_int, CLOCK_ADAT_INDEX, tmp, clkMode);
#endif #endif
@@ -490,7 +490,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
/* Receive sample from S/PDIF RX thread (steaming chan) */ /* Receive sample from S/PDIF RX thread (steaming chan) */
case c_spdif_rx :> tmp: case c_spdif_rx :> tmp:
@@ -577,7 +577,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
} }
break; break;
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
/* receive sample from ADAT rx thread (streaming channel with CT_END) */ /* receive sample from ADAT rx thread (streaming channel with CT_END) */
case inuint_byref(c_adat_rx, tmp): case inuint_byref(c_adat_rx, tmp):
/* record time of sample */ /* record time of sample */
@@ -693,10 +693,10 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Mixer requests data */ /* Mixer requests data */
case inuint_byref(c_dig_rx, tmp): case inuint_byref(c_dig_rx, tmp):
#ifdef SPDIF_RX #if SPDIF_RX
if(spdifUnderflow) if(spdifUnderflow)
{ {
/* S/PDIF underflowing, send out zero samples */ /* S/PDIF underflowing, send out zero samples */
@@ -712,8 +712,6 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
spdifRd += 2; spdifRd += 2;
spdifRd &= (MAX_SPDIF_SAMPLES - 1); spdifRd &= (MAX_SPDIF_SAMPLES - 1);
g_digData[0] = tmp; g_digData[0] = tmp;
g_digData[1] = tmp2; g_digData[1] = tmp2;
@@ -736,7 +734,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
} }
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
if (adatUnderflow) if (adatUnderflow)
{ {
/* ADAT underflowing, send out zero samples */ /* ADAT underflowing, send out zero samples */

192
lib_xua/src/core/endpoint0/chanstrings.h
View File

@@ -1294,7 +1294,7 @@
#if (1 < I2S_CHANS_ADC+1) #if (1 < I2S_CHANS_ADC+1)
"Analogue 1" "Analogue 1"
#endif #endif
#if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (1 < I2S_CHANS_ADC+1) #if (1 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1304,8 +1304,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((1 < ADAT_RX_INDEX+8+1) && (1 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((1 < ADAT_RX_INDEX+8+1) && (1 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (1 < I2S_CHANS_ADC+1) #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (1 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(1 - ADAT_TX_INDEX == 1) #if(1 - ADAT_TX_INDEX == 1)
@@ -1334,7 +1334,7 @@
#if (2 < I2S_CHANS_ADC+1) #if (2 < I2S_CHANS_ADC+1)
"Analogue 2" "Analogue 2"
#endif #endif
#if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (2 < I2S_CHANS_ADC+1) #if (2 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1344,8 +1344,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((2 < ADAT_RX_INDEX+8+1) && (2 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((2 < ADAT_RX_INDEX+8+1) && (2 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (2 < I2S_CHANS_ADC+1) #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (2 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(2 - ADAT_TX_INDEX == 1) #if(2 - ADAT_TX_INDEX == 1)
@@ -1374,7 +1374,7 @@
#if (3 < I2S_CHANS_ADC+1) #if (3 < I2S_CHANS_ADC+1)
"Analogue 3" "Analogue 3"
#endif #endif
#if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (3 < I2S_CHANS_ADC+1) #if (3 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1384,8 +1384,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((3 < ADAT_RX_INDEX+8+1) && (3 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((3 < ADAT_RX_INDEX+8+1) && (3 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (3 < I2S_CHANS_ADC+1) #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (3 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(3 - ADAT_TX_INDEX == 1) #if(3 - ADAT_TX_INDEX == 1)
@@ -1414,7 +1414,7 @@
#if (4 < I2S_CHANS_ADC+1) #if (4 < I2S_CHANS_ADC+1)
"Analogue 4" "Analogue 4"
#endif #endif
#if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (4 < I2S_CHANS_ADC+1) #if (4 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1424,8 +1424,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((4 < ADAT_RX_INDEX+8+1) && (4 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((4 < ADAT_RX_INDEX+8+1) && (4 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (4 < I2S_CHANS_ADC+1) #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (4 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(4 - ADAT_TX_INDEX == 1) #if(4 - ADAT_TX_INDEX == 1)
@@ -1454,7 +1454,7 @@
#if (5 < I2S_CHANS_ADC+1) #if (5 < I2S_CHANS_ADC+1)
"Analogue 5" "Analogue 5"
#endif #endif
#if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (5 < I2S_CHANS_ADC+1) #if (5 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1464,8 +1464,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((5 < ADAT_RX_INDEX+8+1) && (5 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((5 < ADAT_RX_INDEX+8+1) && (5 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (5 < I2S_CHANS_ADC+1) #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (5 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(5 - ADAT_TX_INDEX == 1) #if(5 - ADAT_TX_INDEX == 1)
@@ -1494,7 +1494,7 @@
#if (6 < I2S_CHANS_ADC+1) #if (6 < I2S_CHANS_ADC+1)
"Analogue 6" "Analogue 6"
#endif #endif
#if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (6 < I2S_CHANS_ADC+1) #if (6 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1504,8 +1504,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((6 < ADAT_RX_INDEX+8+1) && (6 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((6 < ADAT_RX_INDEX+8+1) && (6 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (6 < I2S_CHANS_ADC+1) #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (6 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(6 - ADAT_TX_INDEX == 1) #if(6 - ADAT_TX_INDEX == 1)
@@ -1534,7 +1534,7 @@
#if (7 < I2S_CHANS_ADC+1) #if (7 < I2S_CHANS_ADC+1)
"Analogue 7" "Analogue 7"
#endif #endif
#if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (7 < I2S_CHANS_ADC+1) #if (7 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1544,8 +1544,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((7 < ADAT_RX_INDEX+8+1) && (7 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((7 < ADAT_RX_INDEX+8+1) && (7 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (7 < I2S_CHANS_ADC+1) #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (7 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(7 - ADAT_TX_INDEX == 1) #if(7 - ADAT_TX_INDEX == 1)
@@ -1574,7 +1574,7 @@
#if (8 < I2S_CHANS_ADC+1) #if (8 < I2S_CHANS_ADC+1)
"Analogue 8" "Analogue 8"
#endif #endif
#if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (8 < I2S_CHANS_ADC+1) #if (8 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1584,8 +1584,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((8 < ADAT_RX_INDEX+8+1) && (8 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((8 < ADAT_RX_INDEX+8+1) && (8 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (8 < I2S_CHANS_ADC+1) #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (8 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(8 - ADAT_TX_INDEX == 1) #if(8 - ADAT_TX_INDEX == 1)
@@ -1614,7 +1614,7 @@
#if (9 < I2S_CHANS_ADC+1) #if (9 < I2S_CHANS_ADC+1)
"Analogue 9" "Analogue 9"
#endif #endif
#if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (9 < I2S_CHANS_ADC+1) #if (9 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1624,8 +1624,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((9 < ADAT_RX_INDEX+8+1) && (9 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((9 < ADAT_RX_INDEX+8+1) && (9 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (9 < I2S_CHANS_ADC+1) #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (9 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(9 - ADAT_TX_INDEX == 1) #if(9 - ADAT_TX_INDEX == 1)
@@ -1654,7 +1654,7 @@
#if (10 < I2S_CHANS_ADC+1) #if (10 < I2S_CHANS_ADC+1)
"Analogue 10" "Analogue 10"
#endif #endif
#if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (10 < I2S_CHANS_ADC+1) #if (10 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1664,8 +1664,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((10 < ADAT_RX_INDEX+8+1) && (10 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((10 < ADAT_RX_INDEX+8+1) && (10 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (10 < I2S_CHANS_ADC+1) #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (10 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(10 - ADAT_TX_INDEX == 1) #if(10 - ADAT_TX_INDEX == 1)
@@ -1694,7 +1694,7 @@
#if (11 < I2S_CHANS_ADC+1) #if (11 < I2S_CHANS_ADC+1)
"Analogue 11" "Analogue 11"
#endif #endif
#if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (11 < I2S_CHANS_ADC+1) #if (11 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1704,8 +1704,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((11 < ADAT_RX_INDEX+8+1) && (11 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((11 < ADAT_RX_INDEX+8+1) && (11 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (11 < I2S_CHANS_ADC+1) #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (11 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(11 - ADAT_TX_INDEX == 1) #if(11 - ADAT_TX_INDEX == 1)
@@ -1734,7 +1734,7 @@
#if (12 < I2S_CHANS_ADC+1) #if (12 < I2S_CHANS_ADC+1)
"Analogue 12" "Analogue 12"
#endif #endif
#if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (12 < I2S_CHANS_ADC+1) #if (12 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1744,8 +1744,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((12 < ADAT_RX_INDEX+8+1) && (12 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((12 < ADAT_RX_INDEX+8+1) && (12 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (12 < I2S_CHANS_ADC+1) #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (12 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(12 - ADAT_TX_INDEX == 1) #if(12 - ADAT_TX_INDEX == 1)
@@ -1774,7 +1774,7 @@
#if (13 < I2S_CHANS_ADC+1) #if (13 < I2S_CHANS_ADC+1)
"Analogue 13" "Analogue 13"
#endif #endif
#if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (13 < I2S_CHANS_ADC+1) #if (13 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1784,8 +1784,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((13 < ADAT_RX_INDEX+8+1) && (13 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((13 < ADAT_RX_INDEX+8+1) && (13 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (13 < I2S_CHANS_ADC+1) #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (13 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(13 - ADAT_TX_INDEX == 1) #if(13 - ADAT_TX_INDEX == 1)
@@ -1814,7 +1814,7 @@
#if (14 < I2S_CHANS_ADC+1) #if (14 < I2S_CHANS_ADC+1)
"Analogue 14" "Analogue 14"
#endif #endif
#if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (14 < I2S_CHANS_ADC+1) #if (14 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1824,8 +1824,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((14 < ADAT_RX_INDEX+8+1) && (14 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((14 < ADAT_RX_INDEX+8+1) && (14 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (14 < I2S_CHANS_ADC+1) #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (14 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(14 - ADAT_TX_INDEX == 1) #if(14 - ADAT_TX_INDEX == 1)
@@ -1854,7 +1854,7 @@
#if (15 < I2S_CHANS_ADC+1) #if (15 < I2S_CHANS_ADC+1)
"Analogue 15" "Analogue 15"
#endif #endif
#if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (15 < I2S_CHANS_ADC+1) #if (15 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1864,8 +1864,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((15 < ADAT_RX_INDEX+8+1) && (15 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((15 < ADAT_RX_INDEX+8+1) && (15 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (15 < I2S_CHANS_ADC+1) #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (15 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(15 - ADAT_TX_INDEX == 1) #if(15 - ADAT_TX_INDEX == 1)
@@ -1894,7 +1894,7 @@
#if (16 < I2S_CHANS_ADC+1) #if (16 < I2S_CHANS_ADC+1)
"Analogue 16" "Analogue 16"
#endif #endif
#if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (16 < I2S_CHANS_ADC+1) #if (16 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1904,8 +1904,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((16 < ADAT_RX_INDEX+8+1) && (16 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((16 < ADAT_RX_INDEX+8+1) && (16 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (16 < I2S_CHANS_ADC+1) #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (16 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(16 - ADAT_TX_INDEX == 1) #if(16 - ADAT_TX_INDEX == 1)
@@ -1934,7 +1934,7 @@
#if (17 < I2S_CHANS_ADC+1) #if (17 < I2S_CHANS_ADC+1)
"Analogue 17" "Analogue 17"
#endif #endif
#if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (17 < I2S_CHANS_ADC+1) #if (17 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1944,8 +1944,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((17 < ADAT_RX_INDEX+8+1) && (17 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((17 < ADAT_RX_INDEX+8+1) && (17 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (17 < I2S_CHANS_ADC+1) #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (17 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(17 - ADAT_TX_INDEX == 1) #if(17 - ADAT_TX_INDEX == 1)
@@ -1974,7 +1974,7 @@
#if (18 < I2S_CHANS_ADC+1) #if (18 < I2S_CHANS_ADC+1)
"Analogue 18" "Analogue 18"
#endif #endif
#if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (18 < I2S_CHANS_ADC+1) #if (18 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -1984,8 +1984,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((18 < ADAT_RX_INDEX+8+1) && (18 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((18 < ADAT_RX_INDEX+8+1) && (18 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (18 < I2S_CHANS_ADC+1) #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (18 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(18 - ADAT_TX_INDEX == 1) #if(18 - ADAT_TX_INDEX == 1)
@@ -2014,7 +2014,7 @@
#if (19 < I2S_CHANS_ADC+1) #if (19 < I2S_CHANS_ADC+1)
"Analogue 19" "Analogue 19"
#endif #endif
#if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (19 < I2S_CHANS_ADC+1) #if (19 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2024,8 +2024,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((19 < ADAT_RX_INDEX+8+1) && (19 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((19 < ADAT_RX_INDEX+8+1) && (19 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (19 < I2S_CHANS_ADC+1) #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (19 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(19 - ADAT_TX_INDEX == 1) #if(19 - ADAT_TX_INDEX == 1)
@@ -2054,7 +2054,7 @@
#if (20 < I2S_CHANS_ADC+1) #if (20 < I2S_CHANS_ADC+1)
"Analogue 20" "Analogue 20"
#endif #endif
#if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (20 < I2S_CHANS_ADC+1) #if (20 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2064,8 +2064,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((20 < ADAT_RX_INDEX+8+1) && (20 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((20 < ADAT_RX_INDEX+8+1) && (20 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (20 < I2S_CHANS_ADC+1) #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (20 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(20 - ADAT_TX_INDEX == 1) #if(20 - ADAT_TX_INDEX == 1)
@@ -2094,7 +2094,7 @@
#if (21 < I2S_CHANS_ADC+1) #if (21 < I2S_CHANS_ADC+1)
"Analogue 21" "Analogue 21"
#endif #endif
#if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (21 < I2S_CHANS_ADC+1) #if (21 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2104,8 +2104,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((21 < ADAT_RX_INDEX+8+1) && (21 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((21 < ADAT_RX_INDEX+8+1) && (21 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (21 < I2S_CHANS_ADC+1) #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (21 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(21 - ADAT_TX_INDEX == 1) #if(21 - ADAT_TX_INDEX == 1)
@@ -2134,7 +2134,7 @@
#if (22 < I2S_CHANS_ADC+1) #if (22 < I2S_CHANS_ADC+1)
"Analogue 22" "Analogue 22"
#endif #endif
#if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (22 < I2S_CHANS_ADC+1) #if (22 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2144,8 +2144,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((22 < ADAT_RX_INDEX+8+1) && (22 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((22 < ADAT_RX_INDEX+8+1) && (22 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (22 < I2S_CHANS_ADC+1) #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (22 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(22 - ADAT_TX_INDEX == 1) #if(22 - ADAT_TX_INDEX == 1)
@@ -2174,7 +2174,7 @@
#if (23 < I2S_CHANS_ADC+1) #if (23 < I2S_CHANS_ADC+1)
"Analogue 23" "Analogue 23"
#endif #endif
#if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (23 < I2S_CHANS_ADC+1) #if (23 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2184,8 +2184,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((23 < ADAT_RX_INDEX+8+1) && (23 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((23 < ADAT_RX_INDEX+8+1) && (23 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (23 < I2S_CHANS_ADC+1) #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (23 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(23 - ADAT_TX_INDEX == 1) #if(23 - ADAT_TX_INDEX == 1)
@@ -2214,7 +2214,7 @@
#if (24 < I2S_CHANS_ADC+1) #if (24 < I2S_CHANS_ADC+1)
"Analogue 24" "Analogue 24"
#endif #endif
#if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (24 < I2S_CHANS_ADC+1) #if (24 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2224,8 +2224,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((24 < ADAT_RX_INDEX+8+1) && (24 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((24 < ADAT_RX_INDEX+8+1) && (24 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (24 < I2S_CHANS_ADC+1) #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (24 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(24 - ADAT_TX_INDEX == 1) #if(24 - ADAT_TX_INDEX == 1)
@@ -2254,7 +2254,7 @@
#if (25 < I2S_CHANS_ADC+1) #if (25 < I2S_CHANS_ADC+1)
"Analogue 25" "Analogue 25"
#endif #endif
#if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (25 < I2S_CHANS_ADC+1) #if (25 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2264,8 +2264,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((25 < ADAT_RX_INDEX+8+1) && (25 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((25 < ADAT_RX_INDEX+8+1) && (25 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (25 < I2S_CHANS_ADC+1) #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (25 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(25 - ADAT_TX_INDEX == 1) #if(25 - ADAT_TX_INDEX == 1)
@@ -2294,7 +2294,7 @@
#if (26 < I2S_CHANS_ADC+1) #if (26 < I2S_CHANS_ADC+1)
"Analogue 26" "Analogue 26"
#endif #endif
#if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (26 < I2S_CHANS_ADC+1) #if (26 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2304,8 +2304,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((26 < ADAT_RX_INDEX+8+1) && (26 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((26 < ADAT_RX_INDEX+8+1) && (26 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (26 < I2S_CHANS_ADC+1) #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (26 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(26 - ADAT_TX_INDEX == 1) #if(26 - ADAT_TX_INDEX == 1)
@@ -2334,7 +2334,7 @@
#if (27 < I2S_CHANS_ADC+1) #if (27 < I2S_CHANS_ADC+1)
"Analogue 27" "Analogue 27"
#endif #endif
#if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (27 < I2S_CHANS_ADC+1) #if (27 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2344,8 +2344,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((27 < ADAT_RX_INDEX+8+1) && (27 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((27 < ADAT_RX_INDEX+8+1) && (27 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (27 < I2S_CHANS_ADC+1) #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (27 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(27 - ADAT_TX_INDEX == 1) #if(27 - ADAT_TX_INDEX == 1)
@@ -2374,7 +2374,7 @@
#if (28 < I2S_CHANS_ADC+1) #if (28 < I2S_CHANS_ADC+1)
"Analogue 28" "Analogue 28"
#endif #endif
#if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (28 < I2S_CHANS_ADC+1) #if (28 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2384,8 +2384,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((28 < ADAT_RX_INDEX+8+1) && (28 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((28 < ADAT_RX_INDEX+8+1) && (28 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (28 < I2S_CHANS_ADC+1) #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (28 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(28 - ADAT_TX_INDEX == 1) #if(28 - ADAT_TX_INDEX == 1)
@@ -2414,7 +2414,7 @@
#if (29 < I2S_CHANS_ADC+1) #if (29 < I2S_CHANS_ADC+1)
"Analogue 29" "Analogue 29"
#endif #endif
#if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (29 < I2S_CHANS_ADC+1) #if (29 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2424,8 +2424,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((29 < ADAT_RX_INDEX+8+1) && (29 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((29 < ADAT_RX_INDEX+8+1) && (29 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (29 < I2S_CHANS_ADC+1) #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (29 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(29 - ADAT_TX_INDEX == 1) #if(29 - ADAT_TX_INDEX == 1)
@@ -2454,7 +2454,7 @@
#if (30 < I2S_CHANS_ADC+1) #if (30 < I2S_CHANS_ADC+1)
"Analogue 30" "Analogue 30"
#endif #endif
#if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (30 < I2S_CHANS_ADC+1) #if (30 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2464,8 +2464,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((30 < ADAT_RX_INDEX+8+1) && (30 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((30 < ADAT_RX_INDEX+8+1) && (30 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (30 < I2S_CHANS_ADC+1) #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (30 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(30 - ADAT_TX_INDEX == 1) #if(30 - ADAT_TX_INDEX == 1)
@@ -2494,7 +2494,7 @@
#if (31 < I2S_CHANS_ADC+1) #if (31 < I2S_CHANS_ADC+1)
"Analogue 31" "Analogue 31"
#endif #endif
#if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (31 < I2S_CHANS_ADC+1) #if (31 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2504,8 +2504,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((31 < ADAT_RX_INDEX+8+1) && (31 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((31 < ADAT_RX_INDEX+8+1) && (31 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (31 < I2S_CHANS_ADC+1) #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (31 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(31 - ADAT_TX_INDEX == 1) #if(31 - ADAT_TX_INDEX == 1)
@@ -2534,7 +2534,7 @@
#if (32 < I2S_CHANS_ADC+1) #if (32 < I2S_CHANS_ADC+1)
"Analogue 32" "Analogue 32"
#endif #endif
#if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && (SPDIF_RX)
#if (32 < I2S_CHANS_ADC+1) #if (32 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
@@ -2544,8 +2544,8 @@
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
#if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && defined(ADAT_RX) #if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && (ADAT_RX)
#if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (32 < I2S_CHANS_ADC+1) #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && (SPDIF_RX) || (32 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(32 - ADAT_TX_INDEX == 1) #if(32 - ADAT_TX_INDEX == 1)

26
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -54,10 +54,10 @@ typedef struct
#if (AUDIO_CLASS == 2) #if (AUDIO_CLASS == 2)
STR_TABLE_ENTRY(clockSelectorStr); /* iClockSel */ STR_TABLE_ENTRY(clockSelectorStr); /* iClockSel */
STR_TABLE_ENTRY(internalClockSourceStr); /* iClockSource for internal clock */ STR_TABLE_ENTRY(internalClockSourceStr); /* iClockSource for internal clock */
#ifdef SPDIF_RX #if SPDIF_RX
STR_TABLE_ENTRY(spdifClockSourceStr); /* iClockSource for external S/PDIF clock */ STR_TABLE_ENTRY(spdifClockSourceStr); /* iClockSource for external S/PDIF clock */
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
STR_TABLE_ENTRY(adatClockSourceStr); /* iClockSource for external S/PDIF clock */ STR_TABLE_ENTRY(adatClockSourceStr); /* iClockSource for external S/PDIF clock */
#endif #endif
#endif #endif
@@ -327,10 +327,10 @@ StringDescTable_t g_strTable =
#if (AUDIO_CLASS == 2) #if (AUDIO_CLASS == 2)
.clockSelectorStr = APPEND_VENDOR_STR(Clock Selector), .clockSelectorStr = APPEND_VENDOR_STR(Clock Selector),
.internalClockSourceStr = APPEND_VENDOR_STR(Internal Clock), .internalClockSourceStr = APPEND_VENDOR_STR(Internal Clock),
#ifdef SPDIF_RX #if SPDIF_RX
.spdifClockSourceStr = APPEND_VENDOR_STR(S/PDIF Clock), .spdifClockSourceStr = APPEND_VENDOR_STR(S/PDIF Clock),
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
.adatClockSourceStr = APPEND_VENDOR_STR(ADAT Clock), .adatClockSourceStr = APPEND_VENDOR_STR(ADAT Clock),
#endif #endif
#endif #endif
@@ -629,10 +629,10 @@ typedef struct
/* Class Specific Audio Control Interface Header Descriptor */ /* Class Specific Audio Control Interface Header Descriptor */
UAC_Descriptor_Interface_AC_t Audio_ClassControlInterface; UAC_Descriptor_Interface_AC_t Audio_ClassControlInterface;
USB_Descriptor_Audio_ClockSource_t Audio_ClockSource; USB_Descriptor_Audio_ClockSource_t Audio_ClockSource;
#ifdef SPDIF_RX #if SPDIF_RX
USB_Descriptor_Audio_ClockSource_t Audio_ClockSource_SPDIF; USB_Descriptor_Audio_ClockSource_t Audio_ClockSource_SPDIF;
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
USB_Descriptor_Audio_ClockSource_t Audio_ClockSource_ADAT; USB_Descriptor_Audio_ClockSource_t Audio_ClockSource_ADAT;
#endif #endif
USB_Descriptor_Audio_ClockSelector_t Audio_ClockSelector; USB_Descriptor_Audio_ClockSelector_t Audio_ClockSelector;
@@ -664,7 +664,7 @@ typedef struct
// USB_Descriptor_Audio_MixerUnit_t Audio_MixerUnit; // USB_Descriptor_Audio_MixerUnit_t Audio_MixerUnit;
unsigned char configDesc_MixerUnit[MIXER_LENGTH]; unsigned char configDesc_MixerUnit[MIXER_LENGTH];
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Interrupt EP */ /* Interrupt EP */
USB_Descriptor_Endpoint_t Audio_Int_Endpoint; USB_Descriptor_Endpoint_t Audio_Int_Endpoint;
#endif #endif
@@ -806,7 +806,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.bDescriptorType = USB_DESCTYPE_INTERFACE, .bDescriptorType = USB_DESCTYPE_INTERFACE,
.bInterfaceNumber = INTERFACE_NUMBER_AUDIO_CONTROL, .bInterfaceNumber = INTERFACE_NUMBER_AUDIO_CONTROL,
.bAlternateSetting = 0x00, /* Must be 0 */ .bAlternateSetting = 0x00, /* Must be 0 */
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
.bNumEndpoints = 0x01, /* 0 or 1 if optional interrupt endpoint is present */ .bNumEndpoints = 0x01, /* 0 or 1 if optional interrupt endpoint is present */
#else #else
.bNumEndpoints = 0x00, .bNumEndpoints = 0x00,
@@ -853,7 +853,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.iClockSource = offsetof(StringDescTable_t, internalClockSourceStr)/sizeof(char *), .iClockSource = offsetof(StringDescTable_t, internalClockSourceStr)/sizeof(char *),
}, },
#ifdef SPDIF_RX #if SPDIF_RX
/* Clock Source Descriptor (4.7.2.1) */ /* Clock Source Descriptor (4.7.2.1) */
.Audio_ClockSource_SPDIF = .Audio_ClockSource_SPDIF =
{ {
@@ -877,7 +877,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
}, },
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
/* Clock Source Descriptor (4.7.2.1) */ /* Clock Source Descriptor (4.7.2.1) */
.Audio_ClockSource_ADAT = .Audio_ClockSource_ADAT =
{ {
@@ -911,11 +911,11 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.bClockID = ID_CLKSEL, .bClockID = ID_CLKSEL,
.bNrPins = NUM_CLOCKS, .bNrPins = NUM_CLOCKS,
.baCSourceId[0] = ID_CLKSRC_INT, /* baCSourceID */ .baCSourceId[0] = ID_CLKSRC_INT, /* baCSourceID */
#ifdef SPDIF_RX #if SPDIF_RX
ID_CLKSRC_SPDIF, /* baCSourceID */ ID_CLKSRC_SPDIF, /* baCSourceID */
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
ID_CLKSRC_ADAT, /* baCSourceID */ ID_CLKSRC_ADAT, /* baCSourceID */
#endif #endif
.bmControl = 0x03, .bmControl = 0x03,
@@ -1367,7 +1367,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
}, },
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Standard AS Interrupt Endpoint Descriptor (4.8.2.1): */ /* Standard AS Interrupt Endpoint Descriptor (4.8.2.1): */
.Audio_Int_Endpoint = .Audio_Int_Endpoint =
{ {

34
lib_xua/src/core/main.xc
View File

@@ -36,11 +36,11 @@
#include "mixer.h" #include "mixer.h"
#endif #endif
#ifdef SPDIF_RX #if (SPDIF_RX == 1)
#include "SpdifReceive.h" #include "SpdifReceive.h"
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
#include "adat_rx.h" #include "adat_rx.h"
#endif #endif
@@ -137,15 +137,15 @@ on tile[SPDIF_TX_TILE] : buffered out port:32 p_spdif_tx = PORT_SPDIF_OUT;
on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx = PORT_ADAT_OUT; on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx = PORT_ADAT_OUT;
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
on stdcore[XUD_TILE] : buffered in port:32 p_adat_rx = PORT_ADAT_IN; on stdcore[XUD_TILE] : buffered in port:32 p_adat_rx = PORT_ADAT_IN;
#endif #endif
#ifdef SPDIF_RX #if (SPDIF_RX == 1)
on tile[XUD_TILE] : buffered in port:4 p_spdif_rx = PORT_SPDIF_IN; on tile[XUD_TILE] : buffered in port:4 p_spdif_rx = PORT_SPDIF_IN;
#endif #endif
#if defined (SPDIF_RX) || defined (ADAT_RX) #if (SPDIF_RX == 1) || (ADAT_RX)
/* Reference to external clock multiplier */ /* Reference to external clock multiplier */
on tile[AUDIO_IO_TILE] : out port p_pll_clk = PORT_PLL_REF; on tile[AUDIO_IO_TILE] : out port p_pll_clk = PORT_PLL_REF;
#endif #endif
@@ -173,7 +173,7 @@ on tile[MIDI_TILE] : clock clk_midi = CLKBLK_MIDI;
on tile[SPDIF_TX_TILE] : clock clk_mst_spd = CLKBLK_SPDIF_TX; on tile[SPDIF_TX_TILE] : clock clk_mst_spd = CLKBLK_SPDIF_TX;
#endif #endif
#ifdef SPDIF_RX #if (SPDIF_RX == 1)
on tile[XUD_TILE] : clock clk_spd_rx = CLKBLK_SPDIF_RX; on tile[XUD_TILE] : clock clk_spd_rx = CLKBLK_SPDIF_RX;
#endif #endif
@@ -189,7 +189,7 @@ in port p_pdm_mclk = PORT_PDM_MCLK;
#if(XUD_SERIES_SUPPORT == XUD_L_SERIES) && defined(ADAT_RX) #if(XUD_SERIES_SUPPORT == XUD_L_SERIES) && (ADAT_RX)
/* Cannot use default clock (CLKBLK_REF) for ADAT RX since it is tied to the /* Cannot use default clock (CLKBLK_REF) for ADAT RX since it is tied to the
60MHz USB clock on G/L series parts. */ 60MHz USB clock on G/L series parts. */
on tile[XUD_TILE] : clock clk_adat_rx = CLKBLK_ADAT_RX; on tile[XUD_TILE] : clock clk_adat_rx = CLKBLK_ADAT_RX;
@@ -245,7 +245,7 @@ XUD_EpType epTypeTableIn[ENDPOINT_COUNT_IN] = { XUD_EPTYPE_CTL | XUD_STATUS_ENAB
#if (NUM_USB_CHAN_IN == 0) || defined(UAC_FORCE_FEEDBACK_EP) #if (NUM_USB_CHAN_IN == 0) || defined(UAC_FORCE_FEEDBACK_EP)
XUD_EPTYPE_ISO, /* Async feedback endpoint */ XUD_EPTYPE_ISO, /* Async feedback endpoint */
#endif #endif
#if defined (SPDIF_RX) || defined (ADAT_RX) #if (SPDIF_RX == 1) || (ADAT_RX)
XUD_EPTYPE_BUL, XUD_EPTYPE_BUL,
#endif #endif
#ifdef MIDI #ifdef MIDI
@@ -386,7 +386,7 @@ VENDOR_REQUESTS_PARAMS_DEC_
c_ea_data, c_ea_data,
#endif #endif
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
/* Audio Interrupt - only used for interrupts on external clock change */ /* Audio Interrupt - only used for interrupts on external clock change */
c_xud_in[ENDPOINT_NUMBER_IN_INTERRUPT], c_xud_in[ENDPOINT_NUMBER_IN_INTERRUPT],
c_clk_int, c_clk_int,
@@ -437,7 +437,7 @@ void usb_audio_io(chanend ?c_aud_in, chanend ?c_adc,
chan c_mix_out; chan c_mix_out;
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
chan c_dig_rx; chan c_dig_rx;
#else #else
#define c_dig_rx null #define c_dig_rx null
@@ -464,7 +464,7 @@ void usb_audio_io(chanend ?c_aud_in, chanend ?c_adc,
#if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
, c_spdif_tx , c_spdif_tx
#endif #endif
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) ||(ADAT_RX)
, c_dig_rx , c_dig_rx
#endif #endif
#if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1) #if (XUD_TILE != 0) && (AUDIO_IO_TILE == 0) && (XUA_DFU_EN == 1)
@@ -476,7 +476,7 @@ void usb_audio_io(chanend ?c_aud_in, chanend ?c_adc,
); );
} }
#if defined(SPDIF_RX) || defined(ADAT_RX) #if (SPDIF_RX) || (ADAT_RX)
{ {
thread_speed(); thread_speed();
@@ -525,13 +525,13 @@ int main()
chan c_mix_ctl; chan c_mix_ctl;
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
streaming chan c_spdif_rx; streaming chan c_spdif_rx;
#else #else
#define c_spdif_rx null #define c_spdif_rx null
#endif #endif
#ifdef ADAT_RX #if ADAT_RX
chan c_adat_rx; chan c_adat_rx;
#else #else
#define c_adat_rx null #define c_adat_rx null
@@ -542,7 +542,7 @@ int main()
#endif #endif
#if (defined (SPDIF_RX) || defined (ADAT_RX)) #if ((SPDIF_RX) || (ADAT_RX))
chan c_clk_ctl; chan c_clk_ctl;
chan c_clk_int; chan c_clk_int;
#else #else
@@ -653,7 +653,7 @@ int main()
#endif #endif
#endif #endif
#ifdef SPDIF_RX #if SPDIF_RX
on tile[XUD_TILE]: on tile[XUD_TILE]:
{ {
thread_speed(); thread_speed();
@@ -661,7 +661,7 @@ int main()
} }
#endif #endif
#ifdef ADAT_RX #if (ADAT_RX)
on stdcore[XUD_TILE] : on stdcore[XUD_TILE] :
{ {
set_thread_fast_mode_on(); set_thread_fast_mode_on();

2
lib_xua/src/core/xua_commands.h
View File

@@ -13,7 +13,7 @@
#define CLOCK_INTERNAL 1 #define CLOCK_INTERNAL 1
#define CLOCK_SPDIF 2 #define CLOCK_SPDIF 2
#ifdef SPDIF_RX #if SPDIF_RX
#define CLOCK_ADAT 3 #define CLOCK_ADAT 3
#else #else
#define CLOCK_ADAT 2 #define CLOCK_ADAT 2