From 4aaa62c8b88e707d0c9c888dda66f4719f51a701 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Fri, 24 Jan 2014 13:27:30 +0000
Subject: [PATCH] c_iap now passed to usb_midi when IAP and MIDI defined

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

diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 83ded3c7..56ea74bf 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -352,13 +352,15 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
 #endif
         }
 
+#if defined(MIDI) || defined(IAP)
         /* MIDI/iAP Core */
-#if defined  (MIDI) || defined IAP
         {
             thread_speed();
-#ifdef MIDI
+#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);
-#else
+#elif defines(IAP)
             iAP(c_iap, null, null, null);
 #endif
         }
@@ -381,13 +383,10 @@ int main()
     chan c_mix_out;
 #ifdef MIDI
     chan c_midi;
-#else
-#define c_midi null
 #endif
 #ifdef IAP
     chan c_iap;
 #endif
-
 #ifdef SU1_ADC_ENABLE
     chan c_adc;
 #else