From 9f65af2912158a8f5a19fe6afc90dc3a425bfd40 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 14 Jun 2013 15:40:35 +0100 Subject: [PATCH] Added support for second master clock-block. Required if USB_CORE != AUDIO_IO_CORE. I.e. u16 --- module_usb_audio/main.xc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc index 9cd39c86..1647532e 100755 --- a/module_usb_audio/main.xc +++ b/module_usb_audio/main.xc @@ -116,6 +116,12 @@ on tile[AUDIO_IO_CORE] : port p_midi_rx = PORT_MIDI_IN; on tile[AUDIO_IO_CORE] : clock clk_midi = XS1_CLKBLK_REF; #endif on tile[AUDIO_IO_CORE] : clock clk_audio_mclk = XS1_CLKBLK_2; /* Master clock */ + +#if(AUDIO_IO_CORE != 0) +on tile[0] : clock clk_audio_mclk2 = XS1_CLKBLK_2; /* Master clock */ +#endif + + on tile[AUDIO_IO_CORE] : clock clk_audio_bclk = XS1_CLKBLK_3; /* Bit clock */ #ifdef SPDIF on tile[AUDIO_IO_CORE] : clock clk_mst_spd = XS1_CLKBLK_1; @@ -239,7 +245,11 @@ int main() //set_port_clock(p_for_mclk_count, clk_audio_mclk); { unsigned x; +#if(AUDIO_IO_CORE != 0) + asm("ldw %0, dp[clk_audio_mclk2]":"=r"(x)); +#else asm("ldw %0, dp[clk_audio_mclk]":"=r"(x)); +#endif asm("setclk res[%0], %1"::"r"(p_for_mclk_count), "r"(x)); }