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

Added channels and clock block required for ADAT to main.xc

Browse Source
This commit is contained in:
Ross Owen
2014-09-15 15:59:58 +01:00
parent a17b4b3ebb
commit 777dfbf885
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module_usb_audio/main.xc
View File

@@ -113,6 +113,7 @@ on tile[AUDIO_IO_TILE] : buffered in port:32 p_i2s_adc[I2S_WIRES_ADC] =
#else #else
#define CLKBLK_MIDI XS1_CLKBLK_REF; #define CLKBLK_MIDI XS1_CLKBLK_REF;
#endif #endif
#define CLKBLK_ADAT_RX XS1_CLKBLK_3
#define CLKBLK_SPDIF_TX XS1_CLKBLK_1 #define CLKBLK_SPDIF_TX XS1_CLKBLK_1
#define CLKBLK_SPDIF_RX XS1_CLKBLK_1 #define CLKBLK_SPDIF_RX XS1_CLKBLK_1
#define CLKBLK_MCLK XS1_CLKBLK_2 #define CLKBLK_MCLK XS1_CLKBLK_2
@@ -366,7 +367,7 @@ void usb_audio_core(chanend c_mix_out
/* Endpoint 0 Core */ /* Endpoint 0 Core */
{ {
thread_speed(); thread_speed();
Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, null, c_EANativeTransport_ctrl); Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl, c_EANativeTransport_ctrl);
} }
/* Decoupling core */ /* Decoupling core */
@@ -400,6 +401,7 @@ chanend c_mix_ctl,
#endif #endif
chanend ?c_aud_cfg, chanend ?c_aud_cfg,
streaming chanend ?c_spdif_rx, streaming chanend ?c_spdif_rx,
chanend ?c_adat_rx,
chanend ?c_clk_ctl, chanend ?c_clk_ctl,
chanend ?c_clk_int chanend ?c_clk_int
) )
@@ -433,11 +435,11 @@ chanend ?c_clk_int
#endif #endif
} }
#ifdef SPDIF_RX #if defined(SPDIF_RX) || defined(ADAT_RX)
{ {
thread_speed(); thread_speed();
clockGen(c_spdif_rx, null, p_pll_clk, c_dig_rx, c_clk_ctl, c_clk_int); clockGen(c_spdif_rx, c_adat_rx, p_pll_clk, c_dig_rx, c_clk_ctl, c_clk_int);
} }
#endif #endif
@@ -484,12 +486,22 @@ int main()
#ifdef SPDIF_RX #ifdef SPDIF_RX
streaming chan c_spdif_rx; streaming chan c_spdif_rx;
#else
#define c_spdif_rx null
#endif
#ifdef ADAT_RX
chan c_adat_rx;
#else
#define c_adat_rx null
#endif
#if (defined (SPDIF_RX) || defined (ADAT_RX))
chan c_clk_ctl; chan c_clk_ctl;
chan c_clk_int; chan c_clk_int;
#else #else
#define c_clk_int null #define c_clk_int null
#define c_clk_ctl null #define c_clk_ctl null
#define c_spdif_rx null
#endif #endif
USER_MAIN_DECLARATIONS USER_MAIN_DECLARATIONS
@@ -516,7 +528,7 @@ int main()
#ifdef MIXER #ifdef MIXER
, c_mix_ctl , c_mix_ctl
#endif #endif
,c_aud_cfg, c_spdif_rx, c_clk_ctl, c_clk_int ,c_aud_cfg, c_spdif_rx, c_adat_rx, c_clk_ctl, c_clk_int
); );
#if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE) #if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE)