From 248b73e285d0c5f3cb019d669a5f0196feb356a7 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Thu, 9 Mar 2017 12:45:59 +0000
Subject: [PATCH] Runtime fixes for DFU disable

---
 module_usb_audio/audio_io/audio_io.xc  | 5 ++++-
 module_usb_audio/audio_io/xua_audio.h  | 2 +-
 module_usb_audio/endpoint0/endpoint0.h | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module_usb_audio/audio_io/audio_io.xc b/module_usb_audio/audio_io/audio_io.xc
index afbe6818..e5e161c1 100755
--- a/module_usb_audio/audio_io/audio_io.xc
+++ b/module_usb_audio/audio_io/audio_io.xc
@@ -1114,7 +1114,7 @@ chanend c_dig_rx,
 #endif
 chanend ?c_config, chanend ?c
 #if XUD_TILE != 0
-, server interface i_dfu dfuInterface
+, server interface i_dfu ?dfuInterface
 #endif
 #if (NUM_PDM_MICS > 0)
 , chanend c_pdm_in
@@ -1382,6 +1382,7 @@ chanend ?c_config, chanend ?c
                     curSamRes_DAC = inuint(c_mix_out);
                 }
 
+#ifdef DFU
                 /* Currently no more audio will happen after this point */
                 if ((curSamFreq / AUD_TO_USB_RATIO) == AUDIO_STOP_FOR_DFU)
                 {
@@ -1410,6 +1411,8 @@ chanend ?c_config, chanend ?c
                         }
                     }
                 }
+#endif
+
 #endif /* NO_USB */
 
 #ifdef SPDIF_TX
diff --git a/module_usb_audio/audio_io/xua_audio.h b/module_usb_audio/audio_io/xua_audio.h
index 95b2c711..12601237 100644
--- a/module_usb_audio/audio_io/xua_audio.h
+++ b/module_usb_audio/audio_io/xua_audio.h
@@ -38,7 +38,7 @@ void audio(chanend c_in,
 #endif
     chanend ?c_config, chanend ?c_adc
 #if (XUD_TILE != 0)
-   , server interface i_dfu dfuInterface
+   , server interface i_dfu ?dfuInterface
 #endif
 #if (NUM_PDM_MICS > 0)
     , chanend c_pdm_in
diff --git a/module_usb_audio/endpoint0/endpoint0.h b/module_usb_audio/endpoint0/endpoint0.h
index b5303864..2aacdc42 100644
--- a/module_usb_audio/endpoint0/endpoint0.h
+++ b/module_usb_audio/endpoint0/endpoint0.h
@@ -23,7 +23,7 @@
  *                                  endpoint manager if present
  */
 void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioCtrl,
-        chanend ?c_mix_ctl,chanend ?c_clk_ctl, chanend ?c_EANativeTransport_ctr, client interface i_dfu dfuInterface
+        chanend ?c_mix_ctl,chanend ?c_clk_ctl, chanend ?c_EANativeTransport_ctr, client interface i_dfu ?dfuInterface
          VENDOR_REQUESTS_PARAMS_DEC_);
 
 #endif