From 777dfbf8858dcd81f5a3e1324c2c4a52bccc8f47 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Mon, 15 Sep 2014 15:59:58 +0100
Subject: [PATCH] Added channels and clock block required for ADAT to main.xc

---
 module_usb_audio/main.xc | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 7eab2e7f..1cf54944 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -113,6 +113,7 @@ on tile[AUDIO_IO_TILE] : buffered in port:32 p_i2s_adc[I2S_WIRES_ADC] =
 #else
 #define CLKBLK_MIDI        XS1_CLKBLK_REF;
 #endif
+#define CLKBLK_ADAT_RX     XS1_CLKBLK_3
 #define CLKBLK_SPDIF_TX    XS1_CLKBLK_1
 #define CLKBLK_SPDIF_RX    XS1_CLKBLK_1
 #define CLKBLK_MCLK        XS1_CLKBLK_2
@@ -366,7 +367,7 @@ void usb_audio_core(chanend c_mix_out
         /* Endpoint 0 Core */
         {
             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 */
@@ -400,6 +401,7 @@ chanend c_mix_ctl,
 #endif
 chanend ?c_aud_cfg,
 streaming chanend ?c_spdif_rx,
+chanend ?c_adat_rx,
 chanend ?c_clk_ctl,
 chanend ?c_clk_int
 )
@@ -433,11 +435,11 @@ chanend ?c_clk_int
 #endif
         }
 
-#ifdef SPDIF_RX
+#if defined(SPDIF_RX) || defined(ADAT_RX)
         {
             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
@@ -484,12 +486,22 @@ int main()
 
 #ifdef 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_int;
 #else
 #define c_clk_int null
 #define c_clk_ctl null
-#define c_spdif_rx null
 #endif
 
     USER_MAIN_DECLARATIONS
@@ -516,7 +528,7 @@ int main()
 #ifdef MIXER
             , c_mix_ctl
 #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)