Support for SPDIF_RX added back into main.xc

module_usb_audio/main.xc

@@ -34,6 +34,7 @@
 
 #ifdef SPDIF_RX
 #include "SpdifReceive.h"
+#include "clocking.h"
 #endif
 
 
@@ -131,15 +132,16 @@ on tile[AUDIO_IO_TILE] : buffered out port:32 p_spdif_tx    = PORT_SPDIF_OUT;
 
 #ifdef SPDIF_RX
 on tile[XUD_TILE] : buffered in port:4 p_spdif_rx           = PORT_SPDIF_IN; /* K: coax, J: optical */
+on tile[AUDIO_IO_TILE] : out port p_pll_clk                 = PORT_PLL_REF;
 #endif
 
 #ifdef MIDI
 on tile[AUDIO_IO_TILE] :  port p_midi_tx                    = PORT_MIDI_OUT;
 
 #if(MIDI_RX_PORT_WIDTH == 4)
-on tile[AUDIO_IO_TILE] :  buffered in port:4 p_midi_rx         = PORT_MIDI_IN;
+on tile[AUDIO_IO_TILE] :  buffered in port:4 p_midi_rx      = PORT_MIDI_IN;
 #elif(MIDI_RX_PORT_WIDTH == 1)
-on tile[AUDIO_IO_TILE] :  buffered in port:1 p_midi_rx         = PORT_MIDI_IN;
+on tile[AUDIO_IO_TILE] :  buffered in port:1 p_midi_rx      = PORT_MIDI_IN;
 #endif
 #endif
 
@@ -250,6 +252,8 @@ void usb_audio_core(chanend c_mix_out
 #ifdef MIXER
 , chanend c_mix_ctl
 #endif
+, chanend ?c_clk_int
+, chanend ?c_clk_ctl
 )
 {
     chan c_sof;
@@ -314,6 +318,7 @@ void usb_audio_core(chanend c_mix_out
 #if defined(SPDIF_RX) || defined(ADAT_RX)
                 /* Audio Interrupt - only used for interrupts on external clock change */
                 c_xud_in[ENDPOINT_NUMBER_IN_INTERRUPT],
+                c_clk_int,
 #endif
                 c_sof, c_aud_ctl, p_for_mclk_count
 #ifdef HID_CONTROLS
@@ -329,13 +334,13 @@ 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);
+            Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl);
         }
 
         /* Decoupling core */
         {
             thread_speed();
-            decouple(c_mix_out, null
+            decouple(c_mix_out
 #ifdef CHAN_BUFF_CTRL
                 , c_buff_ctrl
 #endif
@@ -345,28 +350,24 @@ void usb_audio_core(chanend c_mix_out
     }
 }
 
-void usb_audio_io(chanend c_aud_in, chanend ?c_adc
+void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
 #ifdef MIXER
-, chanend c_mix_ctl
+chanend c_mix_ctl, 
-#endif
-, chanend ?c_aud_cfg
-
-#ifdef SPDIF_RX
-, chanend ?c_dig_rx
 #endif
+chanend ?c_aud_cfg, 
+streaming chanend ?c_spdif_rx,
+chanend ?c_clk_ctl,
+chanend ?c_clk_int
 )
 {
 #ifdef MIXER
     chan c_mix_out;
 #endif
 
+    chan c_dig_rx;
+
     par
     {
-
-#ifdef SPDIF_RX
-        
-#endif
-
 #ifdef MIXER
         /* Mixer cores(s) */
         {
@@ -383,6 +384,15 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
             audio(c_aud_in, c_dig_rx, c_aud_cfg, c_adc);
 #endif
         }
+
+#ifdef SPDIF_RX
+        {
+            thread_speed();
+
+            clockGen(c_spdif_rx, null, p_pll_clk, c_dig_rx, c_clk_ctl, c_clk_int);
+        
+        }
+#endif
         //:
     }
 }
@@ -422,13 +432,16 @@ int main()
 #endif
 
 #ifdef SPDIF_RX
-    chan c_dig_rx;
     streaming chan c_spdif_rx;
+    chan c_clk_ctl;
+    chan c_clk_int;
 #else
 #define c_dig_rx null
+#define c_clk_int null
+#define c_clk_ctl null
+#define c_spdif_rx null
 #endif
 
-
     USER_MAIN_DECLARATIONS
 
     par
@@ -443,15 +456,14 @@ int main()
 #ifdef MIXER
             , c_mix_ctl
 #endif
+            , c_clk_int, c_clk_ctl
 );
 
         on tile[AUDIO_IO_TILE]: usb_audio_io(c_mix_out, c_adc
 #ifdef MIXER
             , c_mix_ctl
 #endif
-            , c_aud_cfg
+            ,c_aud_cfg, c_spdif_rx, c_clk_ctl, c_clk_int
-        
-            , c_dig_rx
         );
 
 #if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE)