From 9422376a5a641957efc688ab6e39910ce73c0253 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Tue, 4 Feb 2014 15:18:41 +0000
Subject: [PATCH] IAP_TILE defined.  IAP_TILE can now != AUDIO_IO_TILE.

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

diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index b68d42bd..912eb1c6 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -25,6 +25,7 @@
 #include "audio.h"
 
 #ifdef IAP
+#include "i2c_shared.h"
 #include "iap.h"
 #endif
 
@@ -40,6 +41,10 @@
 #define XUD_TILE        0
 #endif
 
+#ifndef IAP_TILE
+#define IAP_TILE  AUDIO_IO_TILE
+#endif
+
 /* Audio I/O - Port declarations */
 #if I2S_WIRES_DAC > 0
 on tile[AUDIO_IO_TILE] : buffered out port:32 p_i2s_dac[I2S_WIRES_DAC] =
@@ -322,9 +327,6 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
 #ifdef MIDI
 , chanend c_midi
 #endif
-#ifdef IAP
-, chanend c_iap
-#endif
 #ifdef MIXER
 , chanend c_mix_ctl
 #endif
@@ -352,21 +354,6 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
             audio(c_aud_in, null, null, c_adc);
 #endif
         }
-
-#if defined(MIDI) || defined(IAP)
-        /* MIDI/iAP Core */
-        {
-            thread_speed();
-#if defined(MIDI) && defined (IAP)
-            usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, c_iap, null, null, null);
-#elif defined(MIDI)
-            usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, null, null, null, null);
-#elif defined(IAP)
-            iAP(c_iap, null, null, null);
-#endif
-        }
-#endif
-
     }
 }
 
@@ -418,15 +405,26 @@ int main()
 #ifdef MIDI
             , c_midi
 #endif
-#ifdef IAP
-            , c_iap
-#endif
 #ifdef MIXER
             , c_mix_ctl
 #endif
-
         );
 
+#if defined(MIDI) || defined(IAP)
+        on tile[IAP_TILE]:
+        /* MIDI/iAP Core */
+        {
+            thread_speed();
+#if defined(MIDI) && defined (IAP)
+            usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, c_iap, null, null, null);
+#elif defined(MIDI)
+            usb_midi(p_midi_rx, p_midi_tx, clk_midi, c_midi, 0, null, null, null, null);
+#elif defined(IAP)
+            iAP(c_iap, null, null, null);
+#endif
+        }
+#endif
+
         USER_MAIN_CORES
     }