Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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)
, chanend c_spdif_tx
#endif
#if(defined(SPDIF_RX) || defined(ADAT_RX))
#if((SPDIF_RX) || (ADAT_RX))
, chanend c_dig
#endif
#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,
#endif
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
#if (SPDIF_RX) || (ADAT_RX)
chanend ?c_int,
chanend ?c_clk_int,
#endif
@@ -90,7 +90,7 @@ void XUA_Buffer_Ep(chanend c_aud_out,
chanend c_iap_ea_native_data,
#endif
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
#if (SPDIF_RX) || (ADAT_RX)
chanend ?c_int,
chanend ?c_clk_int,
#endif

21
lib_xua/api/xua_conf_default.h
View File

@@ -347,11 +347,6 @@
#define SPDIF_RX (0)
#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)
*/
@@ -359,17 +354,13 @@
#define ADAT_RX (0)
#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.
* Note, indexed from 0.
*
* 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
#error SPDIF_RX_INDEX not defined and SPDIF_RX defined
#define SPDIF_RX_INDEX 0 /* Default define for doxygen */
@@ -382,7 +373,7 @@
*
* 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
#error ADAT_RX_INDEX not defined and ADAT_RX defined
#define ADAT_RX_INDEX (0) /* Default define for doxygen */
@@ -393,7 +384,7 @@
#endif
#endif
#ifdef ADAT_RX
#if ADAT_RX
/* Setup input stream formats for ADAT */
#if(MAX_FREQ > 96000)
@@ -1173,7 +1164,7 @@ enum USBEndpointNumber_In
ENDPOINT_NUMBER_IN_FEEDBACK,
#endif
ENDPOINT_NUMBER_IN_AUDIO,
#if defined(SPDIF_RX) || defined(ADAT_RX)
#if (SPDIF_RX) || (ADAT_RX)
ENDPOINT_NUMBER_IN_INTERRUPT, /* Audio interrupt/status EP */
#endif
#ifdef MIDI
@@ -1251,9 +1242,9 @@ enum USBEndpointNumber_Out
#endif
/* Length of clock unit/clock-selector units */
#if defined(SPDIF_RX) && defined(ADAT_RX)
#if (SPDIF_RX) && (ADAT_RX)
#define NUM_CLOCKS (3)
#elif defined(SPDIF_RX) || defined(ADAT_RX)
#elif (SPDIF_RX) || (ADAT_RX)
#define NUM_CLOCKS (2)
#else
#define NUM_CLOCKS (1)