diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bbf6fa48..65a9c53a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,60 +1,130 @@
 sc_usb_audio Change Log
 =======================
 
-HEAD
-----
-    - RESOLVED:   Build issue with CODEC_MASTER (xCore is I2S slave) enabled
-    - RESOLVED:   Channel ordering issue in when TDM and CODEC_MASTER mode enabled
+6.12.5
+------   
+    - RESOLVED:   Stream issue when NUM_USB_CHAN_IN < I2S_CHANS_ADC
+
+6.12.4
+------   
+    - RESOLVED:   DFU fail when DSD enabled and USB library not running on tile[0]
+
+6.12.3
+------
+    - RESOLVED:   Method for storing persistent state over a DFU reboot modified to improve resilience 
+                  against code-base and tools changes  
+
+6.12.2
+------
+    - RESOLVED:   Reboot code (used for DFU) failure in tools versions > 14.0.2 (xCORE-200 only)
+    - RESOLVED:   Run-time exception in mixer when MAX_MIX_COUNT > 0 (xCORE-200 only)
+    - RESOLVED:   MAX_MIX_COUNT checked properly for mix strings in string table
+    - CHANGE:     DFU code re-written to use an XC interface. The flash-part may now be connected
+                  to a separate tile to the tile running USB code
+    - CHANGE:     DFU code can now use quad-SPI flash
+    - CHANGE:     Example xmos_dfu application now uses a list of PIDs to allow adding PIDs easier.
+                  --listdevices command also added.
+    - CHANGE:     I2S_CHANS_PER_FRAME and I2S_WIRES_xxx defines tidied
+
+6.12.1
+------
+    - RESOLVED:   Fixes to TDM input timing/sample-alignment when BCLK=MCLK
+    - RESOLVED:   Various minor fixes to allow ADAT_RX to run on xCORE 200 MC AUDIO hardware
+    - CHANGE:     Moved from old SPDIF define to SPDIF_TX
+
+6.12.0
+------
+    - ADDED:      Checks for XUD_200_SERIES define where required
+    - RESOLVED:   Run-time exception due to decouple interrupt not entering correct issue mode
+                  (affects XCORE-200 only)
+    - CHANGE:     SPDIF Tx Core may now reside on a different tile from I2S
+    - CHANGE:     I2C ports now in structure to match new module_i2c_singleport/shared API.
+
+  * Changes to dependencies:
+
+    - sc_util: 1.0.4rc0 -> 1.0.5alpha0
+
+      + xCORE-200 Compatiblity fixes to module_locks
+
+6.11.3
+------
+    - RESOLVED:  (Major) Streaming issue when mixer not enabled (introduced in 6.11.2)
+
+6.11.2
+------
+    - RESOLVED:   (Major) Enumeration issue when MAX_MIX_COUNT > 0 only. Introduced in mixer
+                  optimisations in 6.11.0. Only affects designs using mixer functionality.
+    - RESOLVED:   (Normal) Audio buffering request system modified such that the mixer output is
+                  not silent when in underflow case (i.e. host output stream not active) This issue was
+                  introduced with the addition of DSD functionality and only affects designs using
+                  mixer functionality.
+    - RESOLVED:   (Minor) Potential build issue due to duplicate labels in inline asm in
+                  set_interrupt_handler macro
+    - RESOLVED:   (Minor) BCD_DEVICE define in devicedefines.h now guarded by ifndef (caused issues
+                  with DFU test build configs.
+    - RESOLVED:   (Minor) String descriptor for Clock Selector unit incorrectly reported
+    - RESOLVED:   (Minor) BCD_DEVICE in devicedefines.h now guarded by #ifndef (Caused issues with
+                  default DFU test build configs.
+    - CHANGE:     HID report descriptor defines added to shared user_hid.h
+    - CHANGE:     Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed)
+
+6.11.1
+------
+    - ADDED:      ADAT transmit functionality, including SMUX. See ADAT_TX and ADAT_TX_INDEX.
+    - RESOLVED:   (Normal) Build issue with CODEC_MASTER (xCore is I2S slave) enabled
+    - RESOLVED:   (Minor) Channel ordering issue in when TDM and CODEC_MASTER mode enabled
+    - RESOLVED:   (Normal) DFU fails when SPDIF_RX enabled due to clock block being shared between SPDIF
+                  core and FlashLib
 
 6.11.0
 ------
     - ADDED:      Basic TDM I2S functionality added. See I2S_CHANS_PER_FRAME and I2S_MODE_TDM
-    - CHANGE:     Various optimisations in 'mixer' core to improve performance for higher 
+    - CHANGE:     Various optimisations in 'mixer' core to improve performance for higher
                   channel counts including the use of XC unsafe pointers instead of inline ASM
     - CHANGE:     Mixer mapping disabled when MAX_MIX_COUNT is 0 since this is wasted processing.
-    - CHANGE:     Descriptor changes to allow for channel input/output channel count up to 32 
+    - CHANGE:     Descriptor changes to allow for channel input/output channel count up to 32
                   (previous limit was 18)
 
 6.10.0
 ------
     - CHANGE:     Endpoint management for iAP EA Native Transport now merged into buffer() core.
-                  Previously was separate core (as added in 6.8.0). 
+                  Previously was separate core (as added in 6.8.0).
     - CHANGE:     Minor optimisation to I2S port code for inputs from ADC
 
 6.9.0
 -----
     - ADDED:      ADAT S-MUX II functionality (i.e. 2 channels at 192kHz) - Previously only S-MUX
                   supported (4 channels at 96kHz).
-    - ADDED:      Explicit build warnings if sample rate/depth & channel combination exceeds 
-                  available USB bus bandwidth. 
+    - ADDED:      Explicit build warnings if sample rate/depth & channel combination exceeds
+                  available USB bus bandwidth.
     - RESOLVED:   (Major) Reinstated ADAT input functionality, including descriptors and clock
                   generation/control and stream configuration defines/tables.
-    - RESOLVED:   (Major) S/PDIF/ADAT sample transfer code in audio() (from ClockGen()) moved to 
+    - RESOLVED:   (Major) S/PDIF/ADAT sample transfer code in audio() (from ClockGen()) moved to
                   aid timing.
     - CHANGE:     Modifying mix map now only affects specified mix, previous was applied to all
-                  mixes. CS_XU_MIXSEL control selector now takes values 0 to MAX_MIX_COUNT + 1 
+                  mixes. CS_XU_MIXSEL control selector now takes values 0 to MAX_MIX_COUNT + 1
                   (with 0 affecting all mixes).
-    - CHANGE:     Channel c_dig_rx is no longer nullable, assists with timing due to removal of 
+    - CHANGE:     Channel c_dig_rx is no longer nullable, assists with timing due to removal of
                   null checks inserted by compiler.
     - CHANGE:     ADAT SMUX selection now based on device sample frequency rather than selected
-                  stream format - Endpoint 0 now configures clockgen() on a sample-rate change 
+                  stream format - Endpoint 0 now configures clockgen() on a sample-rate change
                   rather than stream start.
 
 6.8.0
 -----
-    - ADDED:      Evaluation support for iAP EA Native Transport endpoints  
+    - ADDED:      Evaluation support for iAP EA Native Transport endpoints
     - RESOLVED:   (Minor) Reverted change in 6.5.1 release where sample rate listing in Audio Class
                   1.0 descriptors was trimmed (previously 4 rates were always reported). This change
-                  appears to highlight a Windows (only) enumeration issue with the Input & Output 
-                  configs 
-    - RESOLVED:   (Major) Mixer functionality re-instated, including descriptors and various required 
+                  appears to highlight a Windows (only) enumeration issue with the Input & Output
+                  configs
+    - RESOLVED:   (Major) Mixer functionality re-instated, including descriptors and various required
                   updates compatibility with 13 tools
     - RESOLVED:   (Major) Endpoint 0 was requesting an out of bounds channel whilst requesting level data
     - RESOLVED:   (Major) Fast mix code not operates correctly in 13 tools, assembler inserting long jmp
                   instructions
     - RESOLVED:   (Minor) LED level meter code now compatible with 13 tools (shared mem access)
     - RESOLVED    (Minor) Ordering of level data from the device now matches channel ordering into
-                  mixer (previously the device input data and the stream from host were swapped) 
+                  mixer (previously the device input data and the stream from host were swapped)
     - CHANGE:     Level meter buffer naming now resemble functionality
 
 
diff --git a/README.rst b/README.rst
index b556ea6d..4580f0c3 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.11.0alpha2
+:Latest release: 6.12.5rc0
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/module_dfu/.cproject b/module_dfu/.cproject
index da068095..1ab30e26 100644
--- a/module_dfu/.cproject
+++ b/module_dfu/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.56671338" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.87205741" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.87205741" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
@@ -156,7 +156,11 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.23684077" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -271,7 +275,11 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.18653743" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -392,7 +400,11 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
diff --git a/module_dfu/host/xmos_dfu_osx/xmosdfu.cpp b/module_dfu/host/xmos_dfu_osx/xmosdfu.cpp
index f1e72a8d..c58a46f1 100755
--- a/module_dfu/host/xmos_dfu_osx/xmosdfu.cpp
+++ b/module_dfu/host/xmos_dfu_osx/xmosdfu.cpp
@@ -5,12 +5,21 @@
 
 /* the device's vendor and product id */
 #define XMOS_VID 0x20b1
+
+#define XMOS_XCORE_AUDIO_AUDIO2_PID 0x3066
 #define XMOS_L1_AUDIO2_PID 0x0002
 #define XMOS_L1_AUDIO1_PID 0x0003
 #define XMOS_L2_AUDIO2_PID 0x0004
 #define XMOS_SU1_AUDIO2_PID 0x0008
 #define XMOS_U8_MFA_AUDIO2_PID 0x000A
 
+unsigned short pidList[] = {XMOS_XCORE_AUDIO_AUDIO2_PID, 
+                            XMOS_L1_AUDIO2_PID,
+                            XMOS_L1_AUDIO1_PID,
+                            XMOS_L2_AUDIO2_PID,
+                            XMOS_SU1_AUDIO2_PID, 
+                            XMOS_U8_MFA_AUDIO2_PID}; 
+
 unsigned int XMOS_DFU_IF = 0;
 
 #define DFU_REQUEST_TO_DEV 0x21
@@ -35,7 +44,7 @@ unsigned int XMOS_DFU_IF = 0;
 
 static libusb_device_handle *devh = NULL;
 
-static int find_xmos_device(unsigned int id) 
+static int find_xmos_device(unsigned int id, unsigned int list) 
 {
     libusb_device *dev;
     libusb_device **devs;
@@ -46,51 +55,60 @@ static int find_xmos_device(unsigned int id)
 
     while ((dev = devs[i++]) != NULL) 
     {
+        int foundDev = 0;
         struct libusb_device_descriptor desc;
         libusb_get_device_descriptor(dev, &desc); 
-        printf("VID = 0x%x, PID = 0x%x\n", desc.idVendor, desc.idProduct);
-        if (desc.idVendor == XMOS_VID && 
-            ((desc.idProduct == XMOS_L1_AUDIO1_PID) || 
-            (desc.idProduct == XMOS_L1_AUDIO2_PID) ||
-            (desc.idProduct == XMOS_SU1_AUDIO2_PID) ||
-            (desc.idProduct == XMOS_L2_AUDIO2_PID) ||
-            (desc.idProduct == XMOS_U8_MFA_AUDIO2_PID)))
+        printf("VID = 0x%x, PID = 0x%x, BCDDevice: 0x%x\n", desc.idVendor, desc.idProduct, desc.bcdDevice);
+
+        if(desc.idVendor == XMOS_VID)
+        {
+            for(int j = 0; j < sizeof(pidList)/sizeof(unsigned short); j++)
+            {
+                if(desc.idProduct == pidList[j] && !list)
+                {
+                    foundDev = 1;
+                    break;
+                }
+            }
+        }
+
+        if (foundDev)
         {
             if (found == id) 
             {
                 if (libusb_open(dev, &devh) < 0) 
                 {
                     return -1;
-            } 
-            else 
-            {
-                libusb_config_descriptor *config_desc = NULL;
-                libusb_get_active_config_descriptor(dev, &config_desc); 
-                if (config_desc != NULL) 
-                {
-                    for (int j = 0; j < config_desc->bNumInterfaces; j++) 
-                    {
-                        const libusb_interface_descriptor *inter_desc = ((libusb_interface *)&config_desc->interface[j])->altsetting;
-                        if (inter_desc->bInterfaceClass == 0xFE && inter_desc->bInterfaceSubClass == 0x1) 
-                        {
-                            XMOS_DFU_IF = j;
-                        } 
-                    }
-                 } 
+                } 
                 else 
                 {
-                    XMOS_DFU_IF = 0;
+                    libusb_config_descriptor *config_desc = NULL;
+                    libusb_get_active_config_descriptor(dev, &config_desc); 
+                    if (config_desc != NULL) 
+                    {
+                        for (int j = 0; j < config_desc->bNumInterfaces; j++) 
+                        {
+                            const libusb_interface_descriptor *inter_desc = ((libusb_interface *)&config_desc->interface[j])->altsetting;
+                            if (inter_desc->bInterfaceClass == 0xFE && inter_desc->bInterfaceSubClass == 0x1) 
+                            {
+                                XMOS_DFU_IF = j;
+                            } 
+                        }
+                    } 
+                    else 
+                    {
+                        XMOS_DFU_IF = 0;
+                    }
                 }
+                break;
             }
-        break;
-      }
-      found++;
+            found++;
+        }
     }
-  }
 
-  libusb_free_device_list(devs, 1);
+    libusb_free_device_list(devs, 1);
 
-  return devh ? 0 : -1;
+    return devh ? 0 : -1;
 }
 
 int xmos_dfu_resetdevice(void) {
@@ -269,6 +287,7 @@ int main(int argc, char **argv) {
   unsigned int revert = 0;
   unsigned int save = 0;
   unsigned int restore = 0;
+  unsigned int listdev = 0;
 
   char *firmware_filename = NULL;
 
@@ -304,6 +323,10 @@ int main(int argc, char **argv) {
   {
     restore = 1;
   }
+  else if(strcmp(argv[1], "--listdevices") == 0)
+  {
+    listdev = 1;
+  }
   else {
     fprintf(stderr, "Invalid option passed to dfu application\n");
     return -1;
@@ -317,10 +340,15 @@ int main(int argc, char **argv) {
     return -1;
   }
 
-  r = find_xmos_device(0);
-  if (r < 0) {
-    fprintf(stderr, "Could not find/open device\n");
-    return -1;
+  r = find_xmos_device(0, listdev);
+  if (r < 0) 
+  {
+      if(!listdev)
+      {
+        fprintf(stderr, "Could not find/open device\n");
+        return -1;
+      }
+      return 0;
   }
 
   r = libusb_claim_interface(devh, XMOS_DFU_IF);
@@ -339,7 +367,7 @@ int main(int argc, char **argv) {
   {
     xmos_dfu_restore_state(XMOS_DFU_IF); 
   }
-  else
+  else if(!listdev)
   {
 
     printf("Detaching device from application mode.\n");
@@ -356,7 +384,7 @@ int main(int argc, char **argv) {
 
     // NOW IN DFU APPLICATION MODE
 
-    r = find_xmos_device(0);
+    r = find_xmos_device(0, 0);
     if (r < 0) {
       fprintf(stderr, "Could not find/open device\n");
       return -1;
diff --git a/module_dfu/src/dfu.h b/module_dfu/src/dfu.h
index 4ca6876b..d60f450d 100644
--- a/module_dfu/src/dfu.h
+++ b/module_dfu/src/dfu.h
@@ -88,7 +88,7 @@ unsigned char DFUcfgDesc[] = {
 
 int DFUReportResetState(NULLABLE_RESOURCE(chanend , c_user_cmd));
 int DFUDeviceRequests(XUD_ep c_ep0_out, NULLABLE_REFERENCE_PARAM(XUD_ep, ep0_in), REFERENCE_PARAM(USB_SetupPacket_t, sp),
-        NULLABLE_RESOURCE(chanend, c_user_cmd), unsigned int altInterface, unsigned int user_reset);
+        NULLABLE_RESOURCE(chanend, c_user_cmd), unsigned int altInterface, CLIENT_INTERFACE(i_dfu, dfuInterface), REFERENCE_PARAM(int, reset));
 
 /* Helper function for C */
 void DFUDelay(unsigned d);
diff --git a/module_dfu/src/dfu.xc b/module_dfu/src/dfu.xc
index a47632ee..559842be 100644
--- a/module_dfu/src/dfu.xc
+++ b/module_dfu/src/dfu.xc
@@ -8,7 +8,32 @@
 #include "dfu_types.h"
 #include "flash_interface.h"
 
-static int DFU_state = STATE_APP_IDLE;
+#include <dfu_interface.h>
+
+#if (XUD_SERIES_SUPPORT==4)
+/* xCORE-200 */
+/* Note range 0x7FFC8 - 0x7FFFF guarenteed to be untouched by tools */
+#define FLAG_ADDRESS 0x7ffcc
+#else
+/* Note range 0x1FFC8 - 0x1FFFF guarenteed to be untouched by tools */
+#define FLAG_ADDRESS 0x1ffcc
+#endif
+
+/* Store Flag to fixed address */
+static void SetDFUFlag(unsigned x)
+{
+    asm volatile("stw %0, %1[0]" :: "r"(x), "r"(FLAG_ADDRESS));
+}
+
+/* Load flag from fixed address */
+static unsigned GetDFUFlag()
+{
+    unsigned x;
+    asm volatile("ldw %0, %1[0]" : "=r"(x) : "r"(FLAG_ADDRESS));
+    return x;
+}
+
+static int g_DFU_state = STATE_APP_IDLE;
 static int DFU_status = DFU_OK;
 static timer DFUTimer;
 static unsigned int DFUTimerStart = 0;
@@ -17,8 +42,6 @@ static int DFU_flash_connected = 0;
 
 static unsigned int subPagesLeft = 0;
 
-extern int DFU_reset_override;
-
 extern void DFUCustomFlashEnable();
 extern void DFUCustomFlashDisable();
 
@@ -30,20 +53,19 @@ void DFUDelay(unsigned d)
     tmr when timerafter(s + d) :> void;
 }
 
-
-void temp()
-{
-    asm(".linkset DFU_reset_override, _edp.bss");
-    asm(".globl DFU_reset_override");
-}
-
-static int DFU_OpenFlash(chanend ?c_user_cmd)
+/* Return non-zero on error */
+static int DFU_OpenFlash()
 {
 	if (!DFU_flash_connected)
 	{
     	unsigned int cmd_data[16];
         DFUCustomFlashEnable();
-        flash_cmd_init();
+        int error = flash_cmd_init();
+        if(error)
+        {
+            return error;
+        }
+
     	DFU_flash_connected = 1;
   	}
 
@@ -62,14 +84,13 @@ static int DFU_CloseFlash(chanend ?c_user_cmd)
     return 0;
 }
 
-static int DFU_Detach(unsigned int timeout, chanend ?c_user_cmd)
+static int DFU_Detach(unsigned int timeout, chanend ?c_user_cmd, unsigned &DFU_state)
 {
     if (DFU_state == STATE_APP_IDLE)
     {
-
         DFU_state = STATE_APP_DETACH;
 
-        DFU_OpenFlash(c_user_cmd);
+        DFU_OpenFlash();
 
         // Setup DFU timeout value
         DFUResetTimeout = timeout * 100000;
@@ -84,16 +105,20 @@ static int DFU_Detach(unsigned int timeout, chanend ?c_user_cmd)
     return 0;
 }
 
-static int DFU_Dnload(unsigned int request_len, unsigned int block_num, unsigned int request_data[16], chanend ?c_user_cmd)
+static int DFU_Dnload(unsigned int request_len, unsigned int block_num, const unsigned request_data[16], chanend ?c_user_cmd, int &return_data_len, unsigned &DFU_state)
 {
     unsigned int fromDfuIdle = 0;
-
+    return_data_len = 0;
+    int error;
     // Get DFU packets here, sequence is
     // DFU_DOWNLOAD -> DFU_DOWNLOAD_SYNC
     // GET_STATUS -> DFU_DOWNLOAD_SYNC (flash busy) || DFU_DOWNLOAD_IDLE
     // REPEAT UNTIL DFU_DOWNLOAD with 0 length -> DFU_MANIFEST_SYNC
 
-    DFU_OpenFlash(c_user_cmd);
+    if((error = DFU_OpenFlash()))
+    {
+        return error;
+    }
 
     switch (DFU_state)
     {
@@ -102,13 +127,13 @@ static int DFU_Dnload(unsigned int request_len, unsigned int block_num, unsigned
             break;
         default:
             DFU_state = STATE_DFU_ERROR;
-            return 0;
+            return 1;
     }
 
     if ((DFU_state == STATE_DFU_IDLE) && (request_len == 0))
     {
         DFU_state = STATE_DFU_ERROR;
-        return 0;
+        return 1;
     }
     else if (DFU_state == STATE_DFU_IDLE)
     {
@@ -176,7 +201,7 @@ static int DFU_Dnload(unsigned int request_len, unsigned int block_num, unsigned
 }
 
 
-static int DFU_Upload(unsigned int request_len, unsigned int block_num, unsigned int request_data[16], chanend ?c_user_cmd)
+static int DFU_Upload(unsigned int request_len, unsigned int block_num, unsigned data_out[16], unsigned &DFU_state)
 {
     unsigned int cmd_data[16];
     unsigned int firstRead = 0;
@@ -184,7 +209,7 @@ static int DFU_Upload(unsigned int request_len, unsigned int block_num, unsigned
     // Start at flash address 0
     // Keep reading flash pages until read_page returns 1 (address out of range)
     // Return terminating upload packet at this point
-    DFU_OpenFlash(c_user_cmd);
+    DFU_OpenFlash();
 
     switch (DFU_state)
     {
@@ -226,7 +251,7 @@ static int DFU_Upload(unsigned int request_len, unsigned int block_num, unsigned
     }
 
     // Get 64 bytes of page data from memory
-    flash_cmd_read_page_data((request_data, unsigned char[64]));
+    flash_cmd_read_page_data((data_out, unsigned char[64]));
 
     subPagesLeft--;
 
@@ -235,11 +260,11 @@ static int DFU_Upload(unsigned int request_len, unsigned int block_num, unsigned
     return 64;
 }
 
-static int DFU_GetStatus(unsigned int request_len, unsigned int request_data[16], chanend ?c_user_cmd)
+static int DFU_GetStatus(unsigned int request_len, unsigned data_buffer[16], chanend ?c_user_cmd, unsigned &DFU_state)
 {
     unsigned int timeout = 0;
 
-    request_data[0] = timeout << 8 | (unsigned char)DFU_status;
+    data_buffer[0] = timeout << 8 | (unsigned char)DFU_status;
 
     switch (DFU_state)
     {
@@ -262,12 +287,13 @@ static int DFU_GetStatus(unsigned int request_len, unsigned int request_data[16]
             break;
     }
 
-    request_data[1] = DFU_state;
+    data_buffer[1] = DFU_state;
 
     return 6;
+
 }
 
-static int DFU_ClrStatus(void)
+static int DFU_ClrStatus(unsigned &DFU_state)
 {
     if (DFU_state == STATE_DFU_ERROR)
     {
@@ -280,9 +306,8 @@ static int DFU_ClrStatus(void)
     return 0;
 }
 
-static int DFU_GetState(unsigned int request_len, unsigned int request_data[16], chanend ?c_user_cmd)
+static int DFU_GetState(unsigned int request_len, unsigned int request_data[16], chanend ?c_user_cmd, unsigned &DFU_state)
 {
-
     request_data[0] = DFU_state;
 
     switch (DFU_state)
@@ -299,7 +324,7 @@ static int DFU_GetState(unsigned int request_len, unsigned int request_data[16],
     return 1;
 }
 
-static int DFU_Abort(void)
+static int DFU_Abort(unsigned &DFU_state)
 {
     DFU_state = STATE_DFU_IDLE;
     return 0;
@@ -311,24 +336,28 @@ int DFUReportResetState(chanend ?c_user_cmd)
     unsigned int inDFU = 0;
     unsigned int currentTime = 0;
 
-    if (DFU_reset_override == 0x11042011)
+    unsigned flag;
+    flag = GetDFUFlag();
+
+    //if (DFU_reset_override == 0x11042011)
+    if (flag == 0x11042011)
     {
         unsigned int cmd_data[16];
         inDFU = 1;
-        DFU_state = STATE_DFU_IDLE;
+        g_DFU_state = STATE_DFU_IDLE;
         return inDFU;
     }
 
-    switch(DFU_state)
+    switch(g_DFU_state)
     {
         case STATE_APP_DETACH:
         case STATE_DFU_IDLE:
-            DFU_state = STATE_DFU_IDLE;
+            g_DFU_state = STATE_DFU_IDLE;
 
             DFUTimer :> currentTime;
             if (currentTime - DFUTimerStart > DFUResetTimeout)
             {
-                DFU_state = STATE_APP_IDLE;
+                g_DFU_state = STATE_APP_IDLE;
                 inDFU = 0;
             }
             else
@@ -346,10 +375,10 @@ int DFUReportResetState(chanend ?c_user_cmd)
         case STATE_DFU_UPLOAD_IDLE:
         case STATE_DFU_ERROR:
             inDFU = 0;
-            DFU_state = STATE_APP_IDLE;
+            g_DFU_state = STATE_APP_IDLE;
             break;
         default:
-            DFU_state = STATE_DFU_ERROR;
+            g_DFU_state = STATE_DFU_ERROR;
             inDFU = 1;
         break;
     }
@@ -366,7 +395,7 @@ static int XMOS_DFU_RevertFactory(chanend ?c_user_cmd)
 {
     unsigned s = 0;
 
-    DFU_OpenFlash(c_user_cmd);
+    DFU_OpenFlash();
 
     flash_cmd_erase_all();
 
@@ -383,7 +412,6 @@ static int XMOS_DFU_SelectImage(unsigned int index, chanend ?c_user_cmd)
     return 0;
 }
 
-
 static int XMOS_DFU_SaveState()
 {
     return 0;
@@ -394,12 +422,124 @@ static int XMOS_DFU_LoadState()
     return 0;
 }
 
-int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, chanend ?c_user_cmd, unsigned int altInterface, unsigned int user_reset)
+[[distributable]]
+void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd)
+{
+    while(1)
+    {
+        select
+        {
+            case i.HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState)
+                -> {unsigned reset_device_after_ack, int return_data_len, int dfu_reset_override, int returnVal, unsigned newDfuState}:
+
+                reset_device_after_ack = 0;
+                return_data_len = 0;
+                dfu_reset_override = 0;
+                unsigned tmpDfuState = dfuState;
+                returnVal = 0;
+
+                // Map Standard DFU commands onto device level firmware upgrade mechanism
+                switch (sp.bRequest)
+                {
+                    case DFU_DETACH:
+                        tmpDfuState = dfuState;
+                        return_data_len = DFU_Detach(sp.wValue, c_user_cmd, tmpDfuState);
+                        newDfuState = tmpDfuState;;
+                        break;
+
+                    case DFU_DNLOAD:
+                        unsigned data[16];
+                        for(int i = 0; i < 16; i++)
+                            data[i] = data_buffer[i];
+                        returnVal = DFU_Dnload(sp.wLength, sp.wValue, data, c_user_cmd, return_data_len, tmpDfuState);
+                        break;
+
+                    case DFU_UPLOAD:
+                        unsigned data_out[16];
+                        return_data_len = DFU_Upload(sp.wLength, sp.wValue, data_out, tmpDfuState);
+                        for(int i = 0; i < 16; i++)
+                            data_buffer[i] = data_out[i];
+                        break;
+
+                    case DFU_GETSTATUS:
+                        unsigned data_out[16];
+                        return_data_len = DFU_GetStatus(sp.wLength, data_out, c_user_cmd, tmpDfuState);
+                        for(int i = 0; i < 16; i++)
+                            data_buffer[i] = data_out[i];
+                        break;
+
+                    case DFU_CLRSTATUS:
+                        return_data_len = DFU_ClrStatus(tmpDfuState);
+                        break;
+
+                    case DFU_GETSTATE:
+                        unsigned data_out[16];
+                        return_data_len = DFU_GetState(sp.wLength, data_out, c_user_cmd, tmpDfuState);
+                        for(int i = 0; i < 16; i++)
+                            data_buffer[i] = data_out[i];
+                        break;
+
+                    case DFU_ABORT:
+                        return_data_len = DFU_Abort(tmpDfuState);
+                        break;
+
+                    /* XMOS Custom DFU requests */
+                    case XMOS_DFU_RESETDEVICE:
+                        reset_device_after_ack = 1;
+                        return_data_len = 0;
+                        break;
+
+                    case XMOS_DFU_REVERTFACTORY:
+                        return_data_len = XMOS_DFU_RevertFactory(c_user_cmd);
+                        break;
+
+                    case XMOS_DFU_RESETINTODFU:
+                        reset_device_after_ack = 1;
+                        dfu_reset_override = 0x11042011;
+                        return_data_len = 0;
+                        break;
+
+                    case XMOS_DFU_RESETFROMDFU:
+                        reset_device_after_ack = 1;
+                        dfu_reset_override = 0;
+                        return_data_len = 0;
+                        break;
+
+                    case XMOS_DFU_SELECTIMAGE:
+                        return_data_len = XMOS_DFU_SelectImage(sp.wValue, c_user_cmd);
+                        break;
+
+                    case XMOS_DFU_SAVESTATE:
+                        /* Save passed state to flash */
+                        return_data_len = XMOS_DFU_SaveState();
+                        break;
+
+                    case XMOS_DFU_RESTORESTATE:
+                         /* Restore saved state from flash */
+                        return_data_len = XMOS_DFU_LoadState();
+                        break;
+
+                    default:
+                        break;
+                }
+				newDfuState = tmpDfuState;
+                break;
+
+           case i.finish():
+                return;
+        }
+    }
+}
+
+int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, chanend ?c_user_cmd, unsigned int altInterface, client interface i_dfu i,int &reset)
 {
     unsigned int return_data_len = 0;
     unsigned int data_buffer_len = 0;
     unsigned int data_buffer[17];
     unsigned int reset_device_after_ack = 0;
+    int returnVal = 0;
+    unsigned int dfuState = g_DFU_state;
+    int dfuResetOverride;
 
     if(sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_H2D)
     {
@@ -408,80 +548,32 @@ int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, ch
             XUD_GetBuffer(ep0_out, (data_buffer, unsigned char[]), data_buffer_len);
     }
 
-    // Map Standard DFU commands onto device level firmware upgrade mechanism
-    switch (sp.bRequest)
-    {
-        case DFU_DETACH:
-            return_data_len = DFU_Detach(sp.wValue, c_user_cmd);
-            break;
-        case DFU_DNLOAD:
-            return_data_len = DFU_Dnload(sp.wLength, sp.wValue, data_buffer, c_user_cmd);
-            break;
-        case DFU_UPLOAD:
-            return_data_len = DFU_Upload(sp.wLength, sp.wValue, data_buffer, c_user_cmd);
-            break;
-        case DFU_GETSTATUS:
-            return_data_len = DFU_GetStatus(sp.wLength, data_buffer, c_user_cmd);
-            break;
-        case DFU_CLRSTATUS:
-            return_data_len = DFU_ClrStatus();
-            break;
-        case DFU_GETSTATE:
-            return_data_len = DFU_GetState(sp.wLength, data_buffer, c_user_cmd);
-            break;
-        case DFU_ABORT:
-            return_data_len = DFU_Abort();
-            break;
-        /* XMOS Custom DFU requests */
-        case XMOS_DFU_RESETDEVICE:
-            reset_device_after_ack = 1;
-            return_data_len = 0;
-            break;
-        case XMOS_DFU_REVERTFACTORY:
-            return_data_len = XMOS_DFU_RevertFactory(c_user_cmd);
-            break;
-        case XMOS_DFU_RESETINTODFU:
-            reset_device_after_ack = 1;
-            DFU_reset_override = 0x11042011;
-            return_data_len = 0;
-            break;
-        case XMOS_DFU_RESETFROMDFU:
-            reset_device_after_ack = 1;
-            DFU_reset_override = 0;
-            return_data_len = 0;
-            break;
-        case XMOS_DFU_SELECTIMAGE:
-            return_data_len = XMOS_DFU_SelectImage(sp.wValue, c_user_cmd);
-            break;
-        case XMOS_DFU_SAVESTATE:
-            /* Save passed state to flash */
-            return_data_len = XMOS_DFU_SaveState();
-            break;
-        case XMOS_DFU_RESTORESTATE:
-            /* Restore saved state from flash */
-            return_data_len = XMOS_DFU_LoadState();
-            break;
-        default:
-            break;
-    }
+    /* Interface used here such that the handler can be on another tile */
+    {reset_device_after_ack, return_data_len, dfuResetOverride, returnVal, dfuState} = i.HandleDfuRequest(sp, data_buffer, data_buffer_len, g_DFU_state);
 
-    if (sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H && sp.wLength != 0)
-    {
-        XUD_DoGetRequest(ep0_out, ep0_in, (data_buffer, unsigned char[]), return_data_len, return_data_len);
-    }
-    else
-    {
-        XUD_DoSetRequestStatus(ep0_in);
-    }
+    SetDFUFlag(dfuResetOverride);
 
-  	// If device reset requested, handle after command acknowledgement
-  	if (reset_device_after_ack)
-  	{
-		if (user_reset)
-		{
-      		return 1;
+    /* Update our version of dfuState */
+    g_DFU_state = dfuState;
+
+    /* Check if the request was handled */
+    if(returnVal == 0)
+    {
+        if (sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H && sp.wLength != 0)
+        {
+            returnVal = XUD_DoGetRequest(ep0_out, ep0_in, (data_buffer, unsigned char[]), return_data_len, return_data_len);
+        }
+        else
+        {
+            returnVal = XUD_DoSetRequestStatus(ep0_in);
         }
-  	}
 
-  	return 0;
+  	    // If device reset requested, handle after command acknowledgement
+  	    if (reset_device_after_ack)
+  	    {
+  	        reset = 1;
+        }
+    }
+  	return returnVal;
 }
+
diff --git a/module_dfu/src/dfu_interface.h b/module_dfu/src/dfu_interface.h
new file mode 100644
index 00000000..e535313c
--- /dev/null
+++ b/module_dfu/src/dfu_interface.h
@@ -0,0 +1,14 @@
+
+#ifndef __DFU_INTERFACE_H__
+#define __DFU_INTERFACE_H__
+
+#include "usb_std_requests.h"
+
+interface i_dfu
+{
+    {unsigned, int, int, int, unsigned} HandleDfuRequest(USB_SetupPacket_t &sp, unsigned data_buffer[], unsigned data_buffer_length, unsigned dfuState);
+    void finish();
+};
+#endif
+
+
diff --git a/module_dfu/src/flash_interface.c b/module_dfu/src/flash_interface.c
index 9d4d6a05..e0578210 100755
--- a/module_dfu/src/flash_interface.c
+++ b/module_dfu/src/flash_interface.c
@@ -40,6 +40,7 @@ void DFUCustomFlashDisable()
     return;
 }
 
+/* Returns non-zero for error */
 int flash_cmd_init(void)
 {
     fl_BootImageInfo image;
@@ -51,14 +52,18 @@ int flash_cmd_init(void)
     }
 
     if (!flash_device_open)
-        return 0;
+    {
+        return 1;
+    }
 
+#ifndef QUAD_SPI_FLASH
     // Disable flash protection
     fl_setProtection(0);
+#endif
 
     if (fl_getFactoryImage(&image) != 0)
     {
-        return 0;
+        return 1;
     }
 
     factory_image = image;
diff --git a/module_queue/.cproject b/module_queue/.cproject
index c7c68158..9bed8103 100644
--- a/module_queue/.cproject
+++ b/module_queue/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.7708331" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.60520286" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.60520286" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/module_usb_audio/.cproject b/module_usb_audio/.cproject
index 3426382e..5b0ab598 100644
--- a/module_usb_audio/.cproject
+++ b/module_usb_audio/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.55196333" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.36159420" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.36159420" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/module_usb_audio/audio.h b/module_usb_audio/audio.h
index bef4d5d5..271def28 100644
--- a/module_usb_audio/audio.h
+++ b/module_usb_audio/audio.h
@@ -2,6 +2,7 @@
 #define __audio_h__
 
 #include "devicedefines.h"
+#include "dfu_interface.h"
 /** The audio driver thread.
  *
  *  This function drives I2S ports and handles samples to/from other digital
@@ -15,9 +16,18 @@
  *                  CODEC configuration functions.
  */
 void audio(chanend c_in,
-#if (defined(SPDIF_RX) || defined(ADAT_RX))
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+    chanend c_spdif_tx,
+#endif
+#if(defined(SPDIF_RX) || defined(ADAT_RX))
     chanend c_dig,
 #endif
-    chanend ?c_config, chanend ?c_adc);
+    chanend ?c_config, chanend ?c_adc
+#if (XUD_TILE != 0)
+   , server interface i_dfu dfuInterface
+#endif
+);
+
+void SpdifTxWrapper(chanend c_spdif_tx);
 
 #endif // __audio_h__
diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 5c550503..a91ca4a1 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -14,14 +14,25 @@
 #include <xs1_su.h>
 
 #include "devicedefines.h"
+
+#include "dfu_interface.h"
 #include "audioports.h"
 #include "audiohw.h"
-#ifdef SPDIF
+#ifdef SPDIF_TX
 #include "SpdifTransmit.h"
 #endif
+#ifdef ADAT_TX
+#include "adat_tx.h"
+
+#ifndef ADAT_TX_USE_SHARED_BUFF
+#error Designed for ADAT tx shared buffer mode ONLY
+#endif
+#endif
+
 #include "commands.h"
 #include "xc_ptr.h"
 
+#include "print.h"
 
 static unsigned samplesOut[NUM_USB_CHAN_OUT];
 
@@ -71,11 +82,16 @@ unsigned dsdMode = DSD_MODE_OFF;
 
 /* Master clock input */
 extern port p_mclk_in;
+extern in port p_mclk_in2;
 
-#ifdef SPDIF
+#ifdef SPDIF_TX
 extern buffered out port:32 p_spdif_tx;
 #endif
 
+#ifdef ADAT_TX
+extern buffered out port:32 p_adat_tx;
+#endif
+
 extern clock    clk_audio_mclk;
 extern clock    clk_audio_bclk;
 extern clock    clk_mst_spd;
@@ -153,113 +169,152 @@ static inline void doI2SClocks(unsigned divide)
 }
 #endif
 
+#ifdef ADAT_TX
+unsigned adatCounter = 0;
+unsigned adatSamples[8];
+
+#pragma unsafe arrays
+static inline void TransferAdatTxSamples(chanend c_adat_out, const unsigned samplesFromHost[], int smux, int handshake)
+{
+
+    /* Do some re-arranging for SMUX.. */
+    unsafe
+    {
+        unsigned * unsafe samplesFromHostAdat = &samplesFromHost[ADAT_TX_INDEX];
+
+        /* Note, when smux == 1 this loop just does a straight 1:1 copy */
+        //if(smux != 1)
+        {
+            int adatSampleIndex = adatCounter;
+            for(int i = 0; i < (8/smux); i++)
+            {
+                adatSamples[adatSampleIndex] = samplesFromHostAdat[i];
+                adatSampleIndex += smux;
+            }
+        }
+    }
+
+    adatCounter++;
+
+    if(adatCounter == smux)
+    {
+
+#ifdef ADAT_TX_USE_SHARED_BUFF
+        unsafe
+        {
+            /* Wait for ADAT core to be done with buffer */
+            /* Note, we are "running ahead" of the ADAT core */
+            inuint(c_adat_out);
+
+            /* Send buffer pointer over to ADAT core */
+            volatile unsigned * unsafe samplePtr = &adatSamples;
+            outuint(c_adat_out, (unsigned) samplePtr);
+        }
+#else
+#pragma loop unroll
+        for (int i = 0; i < 8; i++)
+        {
+            outuint(c_adat_out, samplesFromHost[ADAT_TX_INDEX + i]);
+        }
+#endif
+        adatCounter = 0;
+    }
+}
+#endif
+
+
 #pragma unsafe arrays
 static inline unsigned DoSampleTransfer(chanend c_out, int readBuffNo, unsigned underflowWord)
 {
-    unsigned command;
-    unsigned underflow;
+    outuint(c_out, underflowWord);
 
-     outuint(c_out, 0);
-
-        /* Check for sample freq change (or other command) or new samples from mixer*/
-        if(testct(c_out))
-        {
-            unsigned command = inct(c_out);
+    /* Check for sample freq change (or other command) or new samples from mixer*/
+    if(testct(c_out))
+    {
+        unsigned command = inct(c_out);
 #ifndef CODEC_MASTER
+        if(dsdMode == DSD_MODE_OFF)
+        {
             // Set clocks low
             p_lrclk <: 0;
             p_bclk <: 0;
+        }
+        else
+        {
 #if(DSD_CHANS_DAC != 0)
             /* DSD Clock might not be shared with lrclk or bclk... */
             p_dsd_clk <: 0;
 #endif
+        }
 #endif
 #if (DSD_CHANS_DAC > 0)
-            if(dsdMode == DSD_MODE_DOP)
-                dsdMode = DSD_MODE_OFF;
+        if(dsdMode == DSD_MODE_DOP)
+            dsdMode = DSD_MODE_OFF;
 #endif
 #pragma xta endpoint "received_command"
             return command;
-
-        }
-        else
-        {
-            underflow = inuint(c_out);
+    }
+    else
+    {
 #ifndef MIXER // Interfaces straight to decouple()
+        inuint(c_out);
 #if NUM_USB_CHAN_IN > 0
 #pragma loop unroll
-            for(int i = 0; i < I2S_CHANS_ADC; i++)
-            {
-                if(readBuffNo)
-                    outuint(c_out, samplesIn_1[i]);
-                else
-                    outuint(c_out, samplesIn_0[i]);
-            }
-            /* Send over the digi channels - no odd buffering required */
-#pragma loop unroll
-            for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
-            {
+        for(int i = 0; i < I2S_CHANS_ADC; i++)
+        {
+            if(readBuffNo)
+                outuint(c_out, samplesIn_1[i]);
+            else
                 outuint(c_out, samplesIn_0[i]);
-            }
+        }
+        /* Send over the digi channels - no odd buffering required */
+#pragma loop unroll
+        for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
+        {
+            outuint(c_out, samplesIn_0[i]);
+        }
 #endif
 
 #if NUM_USB_CHAN_OUT > 0
-            if(underflow)
-            {
 #pragma loop unroll
-                for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-                {
-                    samplesOut[i] = underflowWord;
-                }
-            }
-            else
-            {
-#pragma loop unroll
-                for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-                {
-                    samplesOut[i] = inuint(c_out);
-                }
-            }
+        for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
+        {
+            samplesOut[i] = inuint(c_out);
+        }
 #endif
 #else /* ifndef MIXER */
 #if NUM_USB_CHAN_OUT > 0
-            if(underflow)
-            {
-                for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-                {
-                    samplesOut[i] = underflowWord;
-                }
-            }
-            else
-            {
 #pragma loop unroll
-                for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-                {
-                    int tmp = inuint(c_out);
-                    samplesOut[i] = tmp;
-                }
-            }
+        for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
+        {
+            int tmp = inuint(c_out);
+            samplesOut[i] = tmp;
+        }
 #endif
 #if NUM_USB_CHAN_IN > 0
 #pragma loop unroll
-            for(int i = 0; i < I2S_CHANS_ADC; i++)
-            {
-                if(readBuffNo)
-                    outuint(c_out, samplesIn_1[i]);
-                else
-                    outuint(c_out, samplesIn_0[i]);
-            }
-            /* Send over the digi channels - no odd buffering required */
-#pragma loop unroll
-            for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
-            {
+#if  NUM_USB_CHAN_IN < I2S_CHANS_ADC
+        for(int i = 0; i < NUM_USB_CHAN_IN; i++)
+#else
+        for(int i = 0; i < I2S_CHANS_ADC; i++)
+#endif
+        {
+            if(readBuffNo)
+                outuint(c_out, samplesIn_1[i]);
+            else
                 outuint(c_out, samplesIn_0[i]);
-            }
-#endif
-#endif
         }
+        /* Send over the digi channels - no odd buffering required */
+#pragma loop unroll
+        for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
+        {
+            outuint(c_out, samplesIn_0[i]);
+        }
+#endif
+#endif
+    }
 
-        return 0;
+    return 0;
 
 }
 
@@ -271,9 +326,14 @@ static inline void InitPorts(unsigned divide)
     if(dsdMode == DSD_MODE_OFF)
     {
 #endif
-        /* b_clk must start high */
+
+        if(divide != 1)
+            {
+              /* b_clk must start high */
         p_bclk <: 0x80000000;
         sync(p_bclk);
+     }
+
         /* Clear I2S port buffers */
         clearbuf(p_lrclk);
 
@@ -307,7 +367,6 @@ static inline void InitPorts(unsigned divide)
 
             p_lrclk @ tmp <: 0x7FFFFFFF;
 
-
 #if (I2S_CHANS_ADC != 0)
             for(int i = 0; i < I2S_WIRES_ADC; i++)
             {
@@ -317,6 +376,8 @@ static inline void InitPorts(unsigned divide)
         }
         else /* Divide != 1  */
         {
+
+
 #if (I2S_CHANS_DAC != 0)
             /* Pre-fill the DAC ports */
             for(int i = 0; i < I2S_WIRES_DAC; i++)
@@ -329,6 +390,17 @@ static inline void InitPorts(unsigned divide)
 
             doI2SClocks(divide);
 
+#if (I2S_CHANS_DAC != 0)
+            /* Pre-fill the DAC ports */
+            for(int i = 0; i < I2S_WIRES_DAC; i++)
+            {
+                p_i2s_dac[i] <: 0;
+            }
+#endif
+            /* Pre-fill the LR clock output port */
+            p_lrclk <: 0x0;
+
+            doI2SClocks(divide);
         }
 #if (DSD_CHANS_DAC > 0)
     } /* if (!dsdMode) */
@@ -350,8 +422,8 @@ static inline void InitPorts(unsigned divide)
     p_lrclk when pinseq(1) :> void @ tmp;
 #else
     p_lrclk when pinseq(0) :> void @ tmp;
-#endif  
-   
+#endif
+
     tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ;
     /* E.g. 2 * 32 - 32 + 1 = 33 for stereo */
     /* E..g 8 * 32 - 32 + 1 = 225 for 8 chan TDM */
@@ -378,23 +450,25 @@ static inline void InitPorts(unsigned divide)
 
 /* I2S delivery thread */
 #pragma unsafe arrays
-unsigned static deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, unsigned curSamFreq,
+unsigned static deliver(chanend c_out, chanend ?c_spd_out,
+#ifdef ADAT_TX
+    chanend c_adat_out,
+    unsigned adatSmuxMode,
+#endif
+    unsigned divide, unsigned curSamFreq,
 #if(defined(SPDIF_RX) || defined(ADAT_RX))
-chanend c_dig_rx,
+    chanend c_dig_rx,
 #endif
-chanend ?c_adc)
+    chanend ?c_adc)
 {
-#if (I2S_CHANS_ADC != 0) || defined(SPDIF)
+
+#if (I2S_CHANS_ADC != 0) || defined(SPDIF_TX)
 	unsigned sample;
-#endif
-    unsigned underflow = 0;
-#if NUM_USB_CHAN_OUT > 0
 #endif
 //#if NUM_USB_CHAN_IN > 0
     /* Since DAC and ADC buffered ports off by one sample we buffer previous ADC frame */
     unsigned readBuffNo = 0;
 //#endif
-    unsigned tmp;
     unsigned index;
 
 #ifdef RAMP_CHECK
@@ -412,6 +486,9 @@ chanend ?c_adc)
     unsigned underflowWord = 0;
 
     unsigned frameCount = 0;
+#ifdef ADAT_TX
+    adatCounter = 0;
+#endif
 
 #if(DSD_CHANS_DAC != 0)
     if(dsdMode == DSD_MODE_DOP)
@@ -424,14 +501,18 @@ chanend ?c_adc)
     }
 #endif
 
-#if 1
     unsigned command = DoSampleTransfer(c_out, readBuffNo, underflowWord);
-
+#ifdef ADAT_TX
+    unsafe{
+    //TransferAdatTxSamples(c_adat_out, samplesOut, adatSmuxMode, 0);
+    volatile unsigned * unsafe samplePtr = &samplesOut[ADAT_TX_INDEX];
+    outuint(c_adat_out, (unsigned) samplePtr);
+    }
+#endif
     if(command)
     {
         return command;
     }
-#endif
 
     InitPorts(divide);
 
@@ -549,6 +630,31 @@ chanend ?c_adc)
         else
 #endif
         {
+#if (I2S_CHANS_ADC != 0)
+            /* Input previous L sample into L in buffer */
+            index = 0;
+            /* First input (i.e. frameCount == 0) we read last ADC channel of previous frame.. */
+            unsigned buffIndex = (frameCount < 3) ? !readBuffNo : readBuffNo;
+
+#pragma loop unroll
+            /* First time around we get channel 7 of TDM8 */
+            for(int i = 0; i < I2S_CHANS_ADC; i+=I2S_CHANS_PER_FRAME)
+            {
+                // p_i2s_adc[index++] :> sample;
+                // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
+                asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
+
+                /* Note the use of readBuffNo changes based on frameCount */
+                if(buffIndex)
+                    samplesIn_1[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 0, 2, 4.. on each line.
+                else
+                    samplesIn_0[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample);
+            }
+#endif
+
+
+
+
 #ifndef CODEC_MASTER
             /* LR clock delayed by one clock, This is so MSB is output on the falling edge of BCLK
              * after the falling edge on which LRCLK was toggled. (see I2S spec) */
@@ -578,26 +684,8 @@ chanend ?c_adc)
             doI2SClocks(divide);
 #endif
 
-#if (I2S_CHANS_ADC != 0)
-            /* Input previous L sample into L in buffer */
-            index = 0;
-            /* First input (i.e. frameCoint == 0) we read last ADC channel of previous frame.. */
-            unsigned buffIndex = frameCount ? !readBuffNo : readBuffNo;
-
-#pragma loop unroll
-            /* First time around we get channel 7 of TDM8 */
-            for(int i = 0; i < I2S_CHANS_ADC; i+=I2S_CHANS_PER_FRAME)
-            {
-                // p_i2s_adc[index++] :> sample;
-                // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
-                asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
-
-                /* Note the use of readBuffNo changes based on frameCount */
-                if(buffIndex)
-                    samplesIn_1[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
-                else
-                    samplesIn_0[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
-            }
+#ifdef ADAT_TX
+             TransferAdatTxSamples(c_adat_out, samplesOut, adatSmuxMode, 1);
 #endif
 
         if(frameCount == 0)
@@ -629,13 +717,39 @@ chanend ?c_adc)
         /* Request digital data (with prefill) */
             outuint(c_dig_rx, 0);
 #endif
-#if defined(SPDIF) && (NUM_USB_CHAN_OUT > 0)
+#if defined(SPDIF_TX) && (NUM_USB_CHAN_OUT > 0)
             outuint(c_spd_out, samplesOut[SPDIF_TX_INDEX]);  /* Forward sample to S/PDIF Tx thread */
             sample = samplesOut[SPDIF_TX_INDEX + 1];
             outuint(c_spd_out, sample);                      /* Forward sample to S/PDIF Tx thread */
 #endif
         }
 
+
+#if (I2S_CHANS_ADC != 0)
+            index = 0;
+            /* Channels 0, 2, 4.. on each line */
+#pragma loop unroll
+            for(int i = 0; i < I2S_CHANS_ADC; i += I2S_CHANS_PER_FRAME)
+            {
+                /* Manual IN instruction since compiler generates an extra setc per IN (bug #15256) */
+                asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
+                if(buffIndex)
+                    samplesIn_1[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
+                else
+                    samplesIn_0[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
+
+            }
+
+#ifdef SU1_ADC_ENABLE
+            {
+                unsigned x;
+                x = inuint(c_adc);
+                inct(c_adc);
+                asm volatile("stw %0, dp[g_adcVal]"::"r"(x));
+            }
+#endif
+#endif
+
 #ifndef CODEC_MASTER
 #ifdef I2S_MODE_TDM
             if(frameCount == (I2S_CHANS_PER_FRAME-2))
@@ -662,29 +776,7 @@ chanend ?c_adc)
             doI2SClocks(divide);
 #endif
 
-#if (I2S_CHANS_ADC != 0)
-            index = 0;
-            /* Channels 0, 2, 4.. on each line */
-#pragma loop unroll
-            for(int i = 0; i < I2S_CHANS_ADC; i += I2S_CHANS_PER_FRAME)
-            {
-                /* Manual IN instruction since compiler generates an extra setc per IN (bug #15256) */
-                asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
-                if(readBuffNo)
-                    samplesIn_0[frameCount+i] = bitrev(sample);
-                else
-                    samplesIn_1[frameCount+i] = bitrev(sample);
-            }
 
-#ifdef SU1_ADC_ENABLE
-            {
-                unsigned x;
-                x = inuint(c_adc);
-                inct(c_adc);
-                asm volatile("stw %0, dp[g_adcVal]"::"r"(x));
-            }
-#endif
-#endif
 
         }  // !dsdMode
 #if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
@@ -763,51 +855,92 @@ chanend ?c_adc)
     return 0;
 }
 
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+void SpdifTxWrapper(chanend c_spdif_tx)
+{
+    unsigned portId;
+    //configure_clock_src(clk, p_mclk);
+
+    // TODO could share clock block here..
+    // NOTE, Assuming SPDIF tile == USB tile here..
+    asm("ldw %0, dp[p_mclk_in2]":"=r"(portId));
+    asm("setclk res[%0], %1"::"r"(clk_mst_spd), "r"(portId));
+    configure_out_port_no_ready(p_spdif_tx, clk_mst_spd, 0);
+    set_clock_fall_delay(clk_mst_spd, 7);
+    start_clock(clk_mst_spd);
+
+    while(1)
+    {
+        SpdifTransmit(p_spdif_tx, c_spdif_tx);
+    }
+}
+#endif
+
 /* This function is a dummy version of the deliver thread that does not
    connect to the codec ports. It is used during DFU reset. */
-unsigned static dummy_deliver(chanend c_out)
+
+[[distributable]]
+void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd);
+
+#pragma select handler
+void testct_byref(chanend c, int &returnVal)
 {
+    returnVal = 0;
+    if(testct(c))
+        returnVal = 1;
+}
+
+[[combinable]]
+static void dummy_deliver(chanend c_out, unsigned &command)
+{
+    int ct;
+
+
     while (1)
     {
-        outuint(c_out, 0);
-
-        /* Check for sample freq change or new samples from mixer*/
-        if(testct(c_out))
-        {
-            unsigned command = inct(c_out);
-            return command;
-        }
-        else
+        select
         {
+            /* Check for sample freq change or new samples from mixer*/
+            case testct_byref(c_out, ct):
+                if(ct)
+                {
+                    unsigned command = inct(c_out);
+                    return;
+                }
+                else
+                {
 #ifndef MIXER // Interfaces straight to decouple()
-            (void) inuint(c_out);
+                    (void) inuint(c_out);
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_IN; i++)
-            {
-                outuint(c_out, 0);
-            }
+                    for(int i = 0; i < NUM_USB_CHAN_IN; i++)
+                    {
+                        outuint(c_out, 0);
+                    }
 
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-            {
-                (void) inuint(c_out);
-            }
+                    for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
+                    {
+                        (void) inuint(c_out);
+                    }
 #else
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-            {
-                (void) inuint(c_out);
-            }
+                    for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
+                    {
+                        (void) inuint(c_out);
+                    }
 
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_IN; i++)
-            {
-                outuint(c_out, 0);
-            }
+                for(int i = 0; i < NUM_USB_CHAN_IN; i++)
+                {
+                    outuint(c_out, 0);
+                }
 #endif
+            }
+
+            outuint(c_out, 0);
+            break;
         }
     }
-    return 0;
 }
 #define SAMPLE_RATE      200000
 #define NUMBER_CHANNELS  1
@@ -816,14 +949,27 @@ unsigned static dummy_deliver(chanend c_out)
 #define SAMPLES_PER_PRINT 1
 
 void audio(chanend c_mix_out,
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+chanend c_spdif_out,
+#endif
 #if (defined(ADAT_RX) || defined(SPDIF_RX))
 chanend c_dig_rx,
 #endif
-chanend ?c_config, chanend ?c)
+chanend ?c_config, chanend ?c
+#if XUD_TILE != 0
+, server interface i_dfu dfuInterface
+#endif
+)
 {
-#ifdef SPDIF
+#if defined (SPDIF_TX) && (SPDIF_TX_TILE == AUDIO_IO_TILE)
     chan c_spdif_out;
 #endif
+#ifdef ADAT_TX
+    chan c_adat_out;
+    unsigned adatSmuxMode = 0;
+    unsigned adatMultiple = 0;
+#endif
+
     unsigned curSamFreq = DEFAULT_FREQ;
     unsigned curSamRes_DAC = STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS; /* Default to something reasonable */
     unsigned curSamRes_ADC = STREAM_FORMAT_INPUT_1_RESOLUTION_BITS; /* Default to something reasonable - note, currently this never changes*/
@@ -878,8 +1024,17 @@ chanend ?c_config, chanend ?c)
         EnableBufferedPort(p_dsd_dac[i], 32);
     }
 #endif
-
-#ifdef SPDIF
+#ifdef ADAT_TX
+    /* Share SPDIF clk blk */
+    configure_clock_src(clk_mst_spd, p_mclk_in);
+    configure_out_port_no_ready(p_adat_tx, clk_mst_spd, 0);
+    set_clock_fall_delay(clk_mst_spd, 7);
+#ifndef SPDIF
+    start_clock(clk_mst_spd);
+#endif
+#endif
+    /* Configure ADAT/SPDIF tx ports */
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE == AUDIO_IO_TILE)
     SpdifTransmitPortConfig(p_spdif_tx, clk_mst_spd, p_mclk_in);
 #endif
 
@@ -892,10 +1047,20 @@ chanend ?c_config, chanend ?c)
         if ((MCLK_441 % curSamFreq) == 0)
         {
             mClk = MCLK_441;
+#ifdef ADAT_TX
+            /* Calculate ADAT SMUX mode (1, 2, 4) */
+            adatSmuxMode = curSamFreq / 44100;
+            adatMultiple = mClk / 44100;
+#endif
         }
         else if ((MCLK_48 % curSamFreq) == 0)
         {
             mClk = MCLK_48;
+#ifdef ADAT_TX
+            /* Calculate ADAT SMUX mode (1, 2, 4) */
+            adatSmuxMode = curSamFreq / 48000;
+            adatMultiple = mClk / 48000;
+#endif
         }
 
         /* Calculate master clock to bit clock (or DSD clock) divide for current sample freq
@@ -1011,30 +1176,51 @@ chanend ?c_config, chanend ?c)
         }
         firstRun = 0;
 
-
-
         par
         {
 
-#ifdef SPDIF
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE == AUDIO_IO_TILE)
             {
                 set_thread_fast_mode_on();
                 SpdifTransmit(p_spdif_tx, c_spdif_out);
             }
 #endif
 
+#ifdef ADAT_TX
             {
-#ifdef SPDIF
+                set_thread_fast_mode_on();
+                adat_tx_port(c_adat_out, p_adat_tx);
+            }
+#endif
+            {
+#ifdef SPDIF_TX
                 /* Communicate master clock and sample freq to S/PDIF thread */
                 outuint(c_spdif_out, curSamFreq);
                 outuint(c_spdif_out, mClk);
 #endif
 
+#ifdef ADAT_TX
+                // Configure ADAT parameters ...
+                //
+                // adat_oversampling =  256 for MCLK = 12M288 or 11M2896
+                //                   =  512 for MCLK = 24M576 or 22M5792
+                //                   = 1024 for MCLK = 49M152 or 45M1584
+                //
+                // adatSmuxMode   = 1 for FS =  44K1 or  48K0
+                //                = 2 for FS =  88K2 or  96K0
+                //                = 4 for FS = 176K4 or 192K0
+                outuint(c_adat_out, adatMultiple);
+                outuint(c_adat_out, adatSmuxMode);
+#endif
                 command = deliver(c_mix_out,
-#ifdef SPDIF
+#ifdef SPDIF_TX
                    c_spdif_out,
 #else
                    null,
+#endif
+#ifdef ADAT_TX
+                   c_adat_out,
+                   adatSmuxMode,
 #endif
                    divide, curSamFreq,
 #if defined (ADAT_RX) || defined (SPDIF_RX)
@@ -1061,10 +1247,20 @@ chanend ?c_config, chanend ?c)
 				{
                   	outct(c_mix_out, XS1_CT_END);
 
+                    outuint(c_mix_out, 0);
+
                   	while (1)
 					{
-
-                    	command = dummy_deliver(c_mix_out);
+#if XUD_TILE != 0
+                       [[combine]]
+                        par
+                        {
+                            DFUHandler(dfuInterface, null);
+                            dummy_deliver(c_mix_out, command);
+                        }
+#else
+                        dummy_deliver(c_mix_out, command);
+#endif
                         curSamFreq = inuint(c_mix_out);
 
                     	if (curSamFreq == AUDIO_START_FROM_DFU)
@@ -1074,10 +1270,17 @@ chanend ?c_config, chanend ?c)
                     	}
                   	}
                 }
-
-#ifdef SPDIF
+#ifdef SPDIF_TX
                 /* Notify S/PDIF thread of impending new freq... */
                 outct(c_spdif_out, XS1_CT_END);
+#endif
+#ifdef ADAT_TX
+#ifdef ADAT_TX_USE_SHARED_BUFF
+                /* Take out-standing handshake from ADAT core */
+                inuint(c_adat_out);
+#endif
+                /* Notify ADAT Tx thread of impending new freq... */
+                outct(c_adat_out, XS1_CT_END);
 #endif
             }
         }
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index d664ddc0..77589654 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -38,6 +38,13 @@
 #define MIDI_TILE       AUDIO_IO_TILE
 #endif
 
+/**
+ * @brief Location (tile) of SPDIF Tx. Default: AUDIO_IO_TILE
+ */
+#ifndef SPDIF_TX_TILE
+#define SPDIF_TX_TILE   AUDIO_IO_TILE
+#endif
+
 /**
  * @brief Number of input channels (device to host). Default: NONE (Must be defined by app)
  */
@@ -67,6 +74,21 @@
     #define DSD_CHANS_DAC        0
 #endif
 
+/**
+ * @brief Channels per I2S frame. *
+ *
+ * Default: 2 i.e standard stereo I2S (8 if using TDM i.e. I2S_MODE_TDM).
+ *
+ **/
+#ifndef I2S_CHANS_PER_FRAME
+    #ifdef I2S_MODE_TDM
+        #define I2S_CHANS_PER_FRAME 8
+    #else
+        #define I2S_CHANS_PER_FRAME 2
+    #endif
+#endif
+
+
 /**
  * @brief Number of IS2 channesl to DAC/CODEC. Must be a multiple of 2.
  *
@@ -76,13 +98,9 @@
     #error I2S_CHANS_DAC not defined
     #define I2S_CHANS_DAC 2          /* Define anyway for doxygen */
 #else
+#define I2S_WIRES_DAC            (I2S_CHANS_DAC / I2S_CHANS_PER_FRAME)
+#endif
 
-#ifdef I2S_MODE_TDM
-#define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 3)
-#else
-#define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 1)
-#endif
-#endif
 
 /**
  * @brief Number of I2S channels from ADC/CODEC. Must be a multiple of 2.
@@ -93,27 +111,9 @@
     #error I2S_CHANS_ADC not defined
     #define I2S_CHANS_ADC 2      /* Define anyway for doxygen */
 #else
-
-#ifdef I2S_MODE_TDM
-#define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 3)
-#else
-#define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 1)
-#endif
+#define I2S_WIRES_ADC            (I2S_CHANS_ADC / I2S_CHANS_PER_FRAME)
 #endif
 
-/**
- * @brief Channels per I2S frame. *
- *
- * Default: 2 i.e standard stereo I2S (8 if using TDM i.e. I2S_MODE_TDM).
- *
- **/
-#ifndef I2S_CHANS_PER_FRAME
-#ifdef I2S_MODE_TDM
-#define I2S_CHANS_PER_FRAME 8
-#else
-#define I2S_CHANS_PER_FRAME 2
-#endif
-#endif
 
 /**
  * @brief Max supported sample frequency for device (Hz). Default: 192000
@@ -222,13 +222,13 @@
 /**
  * @brief Enables SPDIF Tx. Default: 0 (Disabled)
  */
-#ifndef SPDIF
-#define SPDIF                    (0)
+#ifndef SPDIF_TX
+#define SPDIF_TX                 (0)
 #endif
 
 /* Tidy up old SPDIF usage */
-#if defined(SPDIF) && (SPDIF == 0)
-#undef SPDIF
+#if defined(SPDIF_TX) && (SPDIF_TX == 0)
+#undef SPDIF_TX
 #endif
 
 /**
@@ -237,7 +237,28 @@
  * Default: 0 (i.e. channels 0 & 1)
  * */
 #ifndef SPDIF_TX_INDEX
-#define SPDIF_TX_INDEX                  (0)
+#define SPDIF_TX_INDEX        (0)
+#endif
+
+/**
+ * @brief Enables ADAT Tx. Default: 0 (Disabled)
+ */
+#ifndef ADAT_TX
+#define ADAT_TX               (0)
+#endif
+
+/* Tidy up old SPDIF usage */
+#if defined(ADAT_TX) && (ADAT_TX == 0)
+#undef ADAT_TX
+#endif
+
+/**
+ * @brief Defines which output channels (8) should be output on ADAT. Note, Output channels indexed from 0.
+ *
+ * Default: 0 (i.e. channels [0:7])
+ * */
+#ifndef ADAT_TX_INDEX
+#define ADAT_TX_INDEX         (0)
 #endif
 
 /**
@@ -430,14 +451,14 @@
  * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
  */
 #ifndef BCD_DEVICE_M
-#define BCD_DEVICE_M             11
+#define BCD_DEVICE_M             12
 #endif
 
 /**
  * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
  */
 #ifndef BCD_DEVICE_N
-#define BCD_DEVICE_N             0
+#define BCD_DEVICE_N             5
 #endif
 
 /**
@@ -447,8 +468,9 @@
  *
  * Default: XMOS USB Audio Release version (e.g. 0x0651 for 6.5.1).
  */
+#ifndef BCD_DEVICE
 #define BCD_DEVICE               ((BCD_DEVICE_J << 8) | ((BCD_DEVICE_M & 0xF) << 4) | (BCD_DEVICE_N & 0xF))
-
+#endif
 
 /**
  * @brief Number of supported output stream formats.
@@ -917,10 +939,12 @@
  */
 #ifdef MIXER
     #ifndef MAX_MIX_COUNT
-    	#define MAX_MIX_COUNT        (8)
+    	#define MAX_MIX_COUNT          (8)
     #endif
 #else
-    #define MAX_MIX_COUNT            (0)
+    #ifndef MAX_MIX_COUNT
+        #define MAX_MIX_COUNT          (0)
+    #endif
 #endif
 
 /**
@@ -931,7 +955,7 @@
  * Default: 18
  */
 #ifndef MIX_INPUTS
-    #define MIX_INPUTS                  (18)
+    #define MIX_INPUTS                 (18)
 #endif
 
 /* Volume processing defines */
diff --git a/module_usb_audio/endpoint0/chanstringgen.py b/module_usb_audio/endpoint0/chanstringgen.py
new file mode 100644
index 00000000..f6716bfc
--- /dev/null
+++ b/module_usb_audio/endpoint0/chanstringgen.py
@@ -0,0 +1,56 @@
+
+
+def genstrings(outputChanCount, chanString, portString, structureString, adc_dac):
+    
+    for i in range(1,outputChanCount):
+
+        print "#if (NUM_USB_CHAN_{c} > {i}-1)\n\
+    .{s}ChanStr_{i}          = \"\"\n\
+    #if ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"Analogue {i}\"\n\
+    #endif\n\
+    #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p})\n\
+        #if ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"/\"\n\
+        #endif\n\
+        #if({i} - SPDIF_{p}_INDEX == 1)\n\
+            \"SPDIF 1\"\n\
+        #elif({i} - SPDIF_{p}_INDEX == 2)\n\
+            \"SPDIF 2\"\n\
+        #endif\n\
+    #endif\n\
+    #if (({i} < ADAT_{p}_INDEX+8+1) && ({i} > ADAT_{p}_INDEX)) && defined(ADAT_{p})\n\
+        #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) || ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"/\"\n\
+        #endif\n\
+        #if({i} - ADAT_TX_INDEX == 1)\n\
+            \"ADAT 1\"\n\
+        #elif({i} - ADAT_TX_INDEX == 2)\n\
+            \"ADAT 2\"\n\
+        #elif({i} - ADAT_TX_INDEX == 3)\n\
+            \"ADAT 3\"\n\
+        #elif({i} - ADAT_TX_INDEX == 4)\n\
+            \"ADAT 4\"\n\
+        #elif({i} - ADAT_TX_INDEX == 5)\n\
+            \"ADAT 5\"\n\
+        #elif({i} - ADAT_TX_INDEX == 6)\n\
+            \"ADAT 6\"\n\
+        #elif({i} - ADAT_TX_INDEX == 7)\n\
+            \"ADAT 7\"\n\
+        #elif({i} - ADAT_TX_INDEX == 8)\n\
+            \"ADAT 8\"\n\
+        #endif\n\
+     #endif\n\
+        ,\n#endif\n".format(i=i, c=chanString, p=portString, s=structureString, adcdac=adc_dac);
+    return;
+
+print "/* AUTOGENERATED using chanstringgen.py */\n"
+print "/* Not very nice looking but the standard preprocessor is not very powerful\n and we save some memory over doing this all at runtime */"
+
+print "/* Output Strings */\n\n"
+
+genstrings(33, "OUT", "TX", "output", "DAC");
+
+print "/* Input Strings */\n\n"
+
+genstrings(33, "IN", "RX", "input", "ADC");
diff --git a/module_usb_audio/endpoint0/chanstrings.h b/module_usb_audio/endpoint0/chanstrings.h
new file mode 100644
index 00000000..90534998
--- /dev/null
+++ b/module_usb_audio/endpoint0/chanstrings.h
@@ -0,0 +1,2570 @@
+/* AUTOGENERATED using chanstringgen.py */
+
+/* Not very nice looking but the standard preprocessor is not very powerful
+ and we save some memory over doing this all at runtime */
+/* Output Strings */
+
+
+#if (NUM_USB_CHAN_OUT > 1-1)
+    .outputChanStr_1          = ""
+    #if (1 < I2S_CHANS_DAC+1)
+        "Analogue 1"
+    #endif
+    #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (1 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(1 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(1 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((1 < ADAT_TX_INDEX+8+1) && (1 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (1 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(1 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(1 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(1 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(1 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(1 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(1 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(1 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(1 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 2-1)
+    .outputChanStr_2          = ""
+    #if (2 < I2S_CHANS_DAC+1)
+        "Analogue 2"
+    #endif
+    #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (2 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(2 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(2 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((2 < ADAT_TX_INDEX+8+1) && (2 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (2 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(2 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(2 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(2 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(2 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(2 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(2 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(2 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(2 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 3-1)
+    .outputChanStr_3          = ""
+    #if (3 < I2S_CHANS_DAC+1)
+        "Analogue 3"
+    #endif
+    #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (3 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(3 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(3 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((3 < ADAT_TX_INDEX+8+1) && (3 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (3 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(3 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(3 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(3 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(3 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(3 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(3 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(3 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(3 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 4-1)
+    .outputChanStr_4          = ""
+    #if (4 < I2S_CHANS_DAC+1)
+        "Analogue 4"
+    #endif
+    #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (4 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(4 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(4 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((4 < ADAT_TX_INDEX+8+1) && (4 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (4 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(4 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(4 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(4 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(4 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(4 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(4 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(4 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(4 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 5-1)
+    .outputChanStr_5          = ""
+    #if (5 < I2S_CHANS_DAC+1)
+        "Analogue 5"
+    #endif
+    #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (5 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(5 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(5 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((5 < ADAT_TX_INDEX+8+1) && (5 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (5 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(5 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(5 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(5 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(5 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(5 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(5 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(5 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(5 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 6-1)
+    .outputChanStr_6          = ""
+    #if (6 < I2S_CHANS_DAC+1)
+        "Analogue 6"
+    #endif
+    #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (6 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(6 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(6 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((6 < ADAT_TX_INDEX+8+1) && (6 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (6 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(6 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(6 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(6 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(6 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(6 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(6 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(6 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(6 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 7-1)
+    .outputChanStr_7          = ""
+    #if (7 < I2S_CHANS_DAC+1)
+        "Analogue 7"
+    #endif
+    #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (7 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(7 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(7 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((7 < ADAT_TX_INDEX+8+1) && (7 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (7 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(7 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(7 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(7 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(7 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(7 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(7 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(7 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(7 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 8-1)
+    .outputChanStr_8          = ""
+    #if (8 < I2S_CHANS_DAC+1)
+        "Analogue 8"
+    #endif
+    #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (8 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(8 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(8 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((8 < ADAT_TX_INDEX+8+1) && (8 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (8 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(8 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(8 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(8 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(8 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(8 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(8 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(8 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(8 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 9-1)
+    .outputChanStr_9          = ""
+    #if (9 < I2S_CHANS_DAC+1)
+        "Analogue 9"
+    #endif
+    #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (9 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(9 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(9 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((9 < ADAT_TX_INDEX+8+1) && (9 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (9 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(9 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(9 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(9 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(9 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(9 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(9 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(9 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(9 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 10-1)
+    .outputChanStr_10          = ""
+    #if (10 < I2S_CHANS_DAC+1)
+        "Analogue 10"
+    #endif
+    #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (10 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(10 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(10 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((10 < ADAT_TX_INDEX+8+1) && (10 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (10 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(10 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(10 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(10 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(10 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(10 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(10 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(10 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(10 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 11-1)
+    .outputChanStr_11          = ""
+    #if (11 < I2S_CHANS_DAC+1)
+        "Analogue 11"
+    #endif
+    #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (11 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(11 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(11 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((11 < ADAT_TX_INDEX+8+1) && (11 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (11 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(11 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(11 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(11 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(11 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(11 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(11 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(11 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(11 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 12-1)
+    .outputChanStr_12          = ""
+    #if (12 < I2S_CHANS_DAC+1)
+        "Analogue 12"
+    #endif
+    #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (12 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(12 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(12 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((12 < ADAT_TX_INDEX+8+1) && (12 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (12 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(12 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(12 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(12 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(12 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(12 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(12 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(12 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(12 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 13-1)
+    .outputChanStr_13          = ""
+    #if (13 < I2S_CHANS_DAC+1)
+        "Analogue 13"
+    #endif
+    #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (13 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(13 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(13 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((13 < ADAT_TX_INDEX+8+1) && (13 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (13 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(13 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(13 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(13 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(13 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(13 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(13 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(13 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(13 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 14-1)
+    .outputChanStr_14          = ""
+    #if (14 < I2S_CHANS_DAC+1)
+        "Analogue 14"
+    #endif
+    #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (14 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(14 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(14 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((14 < ADAT_TX_INDEX+8+1) && (14 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (14 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(14 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(14 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(14 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(14 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(14 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(14 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(14 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(14 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 15-1)
+    .outputChanStr_15          = ""
+    #if (15 < I2S_CHANS_DAC+1)
+        "Analogue 15"
+    #endif
+    #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (15 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(15 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(15 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((15 < ADAT_TX_INDEX+8+1) && (15 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (15 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(15 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(15 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(15 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(15 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(15 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(15 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(15 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(15 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 16-1)
+    .outputChanStr_16          = ""
+    #if (16 < I2S_CHANS_DAC+1)
+        "Analogue 16"
+    #endif
+    #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (16 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(16 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(16 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((16 < ADAT_TX_INDEX+8+1) && (16 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (16 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(16 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(16 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(16 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(16 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(16 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(16 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(16 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(16 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 17-1)
+    .outputChanStr_17          = ""
+    #if (17 < I2S_CHANS_DAC+1)
+        "Analogue 17"
+    #endif
+    #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (17 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(17 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(17 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((17 < ADAT_TX_INDEX+8+1) && (17 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (17 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(17 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(17 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(17 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(17 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(17 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(17 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(17 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(17 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 18-1)
+    .outputChanStr_18          = ""
+    #if (18 < I2S_CHANS_DAC+1)
+        "Analogue 18"
+    #endif
+    #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (18 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(18 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(18 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((18 < ADAT_TX_INDEX+8+1) && (18 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (18 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(18 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(18 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(18 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(18 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(18 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(18 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(18 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(18 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 19-1)
+    .outputChanStr_19          = ""
+    #if (19 < I2S_CHANS_DAC+1)
+        "Analogue 19"
+    #endif
+    #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (19 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(19 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(19 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((19 < ADAT_TX_INDEX+8+1) && (19 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (19 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(19 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(19 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(19 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(19 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(19 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(19 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(19 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(19 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 20-1)
+    .outputChanStr_20          = ""
+    #if (20 < I2S_CHANS_DAC+1)
+        "Analogue 20"
+    #endif
+    #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (20 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(20 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(20 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((20 < ADAT_TX_INDEX+8+1) && (20 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (20 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(20 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(20 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(20 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(20 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(20 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(20 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(20 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(20 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 21-1)
+    .outputChanStr_21          = ""
+    #if (21 < I2S_CHANS_DAC+1)
+        "Analogue 21"
+    #endif
+    #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (21 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(21 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(21 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((21 < ADAT_TX_INDEX+8+1) && (21 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (21 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(21 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(21 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(21 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(21 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(21 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(21 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(21 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(21 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 22-1)
+    .outputChanStr_22          = ""
+    #if (22 < I2S_CHANS_DAC+1)
+        "Analogue 22"
+    #endif
+    #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (22 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(22 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(22 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((22 < ADAT_TX_INDEX+8+1) && (22 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (22 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(22 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(22 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(22 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(22 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(22 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(22 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(22 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(22 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 23-1)
+    .outputChanStr_23          = ""
+    #if (23 < I2S_CHANS_DAC+1)
+        "Analogue 23"
+    #endif
+    #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (23 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(23 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(23 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((23 < ADAT_TX_INDEX+8+1) && (23 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (23 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(23 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(23 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(23 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(23 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(23 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(23 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(23 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(23 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 24-1)
+    .outputChanStr_24          = ""
+    #if (24 < I2S_CHANS_DAC+1)
+        "Analogue 24"
+    #endif
+    #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (24 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(24 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(24 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((24 < ADAT_TX_INDEX+8+1) && (24 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (24 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(24 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(24 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(24 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(24 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(24 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(24 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(24 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(24 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 25-1)
+    .outputChanStr_25          = ""
+    #if (25 < I2S_CHANS_DAC+1)
+        "Analogue 25"
+    #endif
+    #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (25 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(25 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(25 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((25 < ADAT_TX_INDEX+8+1) && (25 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (25 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(25 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(25 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(25 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(25 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(25 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(25 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(25 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(25 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 26-1)
+    .outputChanStr_26          = ""
+    #if (26 < I2S_CHANS_DAC+1)
+        "Analogue 26"
+    #endif
+    #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (26 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(26 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(26 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((26 < ADAT_TX_INDEX+8+1) && (26 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (26 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(26 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(26 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(26 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(26 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(26 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(26 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(26 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(26 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 27-1)
+    .outputChanStr_27          = ""
+    #if (27 < I2S_CHANS_DAC+1)
+        "Analogue 27"
+    #endif
+    #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (27 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(27 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(27 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((27 < ADAT_TX_INDEX+8+1) && (27 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (27 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(27 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(27 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(27 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(27 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(27 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(27 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(27 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(27 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 28-1)
+    .outputChanStr_28          = ""
+    #if (28 < I2S_CHANS_DAC+1)
+        "Analogue 28"
+    #endif
+    #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (28 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(28 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(28 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((28 < ADAT_TX_INDEX+8+1) && (28 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (28 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(28 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(28 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(28 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(28 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(28 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(28 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(28 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(28 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 29-1)
+    .outputChanStr_29          = ""
+    #if (29 < I2S_CHANS_DAC+1)
+        "Analogue 29"
+    #endif
+    #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (29 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(29 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(29 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((29 < ADAT_TX_INDEX+8+1) && (29 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (29 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(29 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(29 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(29 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(29 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(29 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(29 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(29 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(29 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 30-1)
+    .outputChanStr_30          = ""
+    #if (30 < I2S_CHANS_DAC+1)
+        "Analogue 30"
+    #endif
+    #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (30 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(30 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(30 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((30 < ADAT_TX_INDEX+8+1) && (30 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (30 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(30 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(30 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(30 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(30 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(30 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(30 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(30 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(30 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 31-1)
+    .outputChanStr_31          = ""
+    #if (31 < I2S_CHANS_DAC+1)
+        "Analogue 31"
+    #endif
+    #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (31 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(31 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(31 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((31 < ADAT_TX_INDEX+8+1) && (31 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (31 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(31 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(31 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(31 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(31 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(31 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(31 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(31 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(31 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_OUT > 32-1)
+    .outputChanStr_32          = ""
+    #if (32 < I2S_CHANS_DAC+1)
+        "Analogue 32"
+    #endif
+    #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (32 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(32 - SPDIF_TX_INDEX == 1)
+            "SPDIF 1"
+        #elif(32 - SPDIF_TX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((32 < ADAT_TX_INDEX+8+1) && (32 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (32 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(32 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(32 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(32 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(32 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(32 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(32 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(32 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(32 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+/* Input Strings */
+
+
+#if (NUM_USB_CHAN_IN > 1-1)
+    .inputChanStr_1          = ""
+    #if (1 < I2S_CHANS_ADC+1)
+        "Analogue 1"
+    #endif
+    #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (1 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(1 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(1 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((1 < ADAT_RX_INDEX+8+1) && (1 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (1 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(1 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(1 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(1 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(1 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(1 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(1 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(1 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(1 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 2-1)
+    .inputChanStr_2          = ""
+    #if (2 < I2S_CHANS_ADC+1)
+        "Analogue 2"
+    #endif
+    #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (2 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(2 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(2 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((2 < ADAT_RX_INDEX+8+1) && (2 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (2 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(2 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(2 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(2 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(2 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(2 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(2 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(2 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(2 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 3-1)
+    .inputChanStr_3          = ""
+    #if (3 < I2S_CHANS_ADC+1)
+        "Analogue 3"
+    #endif
+    #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (3 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(3 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(3 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((3 < ADAT_RX_INDEX+8+1) && (3 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (3 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(3 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(3 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(3 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(3 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(3 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(3 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(3 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(3 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 4-1)
+    .inputChanStr_4          = ""
+    #if (4 < I2S_CHANS_ADC+1)
+        "Analogue 4"
+    #endif
+    #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (4 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(4 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(4 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((4 < ADAT_RX_INDEX+8+1) && (4 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (4 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(4 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(4 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(4 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(4 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(4 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(4 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(4 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(4 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 5-1)
+    .inputChanStr_5          = ""
+    #if (5 < I2S_CHANS_ADC+1)
+        "Analogue 5"
+    #endif
+    #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (5 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(5 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(5 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((5 < ADAT_RX_INDEX+8+1) && (5 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (5 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(5 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(5 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(5 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(5 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(5 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(5 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(5 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(5 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 6-1)
+    .inputChanStr_6          = ""
+    #if (6 < I2S_CHANS_ADC+1)
+        "Analogue 6"
+    #endif
+    #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (6 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(6 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(6 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((6 < ADAT_RX_INDEX+8+1) && (6 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (6 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(6 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(6 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(6 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(6 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(6 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(6 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(6 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(6 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 7-1)
+    .inputChanStr_7          = ""
+    #if (7 < I2S_CHANS_ADC+1)
+        "Analogue 7"
+    #endif
+    #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (7 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(7 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(7 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((7 < ADAT_RX_INDEX+8+1) && (7 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (7 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(7 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(7 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(7 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(7 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(7 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(7 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(7 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(7 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 8-1)
+    .inputChanStr_8          = ""
+    #if (8 < I2S_CHANS_ADC+1)
+        "Analogue 8"
+    #endif
+    #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (8 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(8 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(8 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((8 < ADAT_RX_INDEX+8+1) && (8 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (8 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(8 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(8 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(8 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(8 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(8 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(8 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(8 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(8 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 9-1)
+    .inputChanStr_9          = ""
+    #if (9 < I2S_CHANS_ADC+1)
+        "Analogue 9"
+    #endif
+    #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (9 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(9 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(9 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((9 < ADAT_RX_INDEX+8+1) && (9 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (9 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(9 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(9 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(9 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(9 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(9 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(9 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(9 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(9 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 10-1)
+    .inputChanStr_10          = ""
+    #if (10 < I2S_CHANS_ADC+1)
+        "Analogue 10"
+    #endif
+    #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (10 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(10 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(10 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((10 < ADAT_RX_INDEX+8+1) && (10 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (10 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(10 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(10 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(10 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(10 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(10 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(10 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(10 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(10 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 11-1)
+    .inputChanStr_11          = ""
+    #if (11 < I2S_CHANS_ADC+1)
+        "Analogue 11"
+    #endif
+    #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (11 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(11 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(11 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((11 < ADAT_RX_INDEX+8+1) && (11 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (11 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(11 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(11 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(11 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(11 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(11 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(11 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(11 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(11 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 12-1)
+    .inputChanStr_12          = ""
+    #if (12 < I2S_CHANS_ADC+1)
+        "Analogue 12"
+    #endif
+    #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (12 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(12 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(12 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((12 < ADAT_RX_INDEX+8+1) && (12 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (12 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(12 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(12 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(12 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(12 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(12 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(12 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(12 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(12 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 13-1)
+    .inputChanStr_13          = ""
+    #if (13 < I2S_CHANS_ADC+1)
+        "Analogue 13"
+    #endif
+    #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (13 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(13 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(13 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((13 < ADAT_RX_INDEX+8+1) && (13 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (13 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(13 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(13 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(13 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(13 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(13 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(13 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(13 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(13 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 14-1)
+    .inputChanStr_14          = ""
+    #if (14 < I2S_CHANS_ADC+1)
+        "Analogue 14"
+    #endif
+    #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (14 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(14 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(14 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((14 < ADAT_RX_INDEX+8+1) && (14 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (14 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(14 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(14 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(14 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(14 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(14 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(14 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(14 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(14 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 15-1)
+    .inputChanStr_15          = ""
+    #if (15 < I2S_CHANS_ADC+1)
+        "Analogue 15"
+    #endif
+    #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (15 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(15 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(15 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((15 < ADAT_RX_INDEX+8+1) && (15 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (15 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(15 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(15 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(15 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(15 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(15 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(15 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(15 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(15 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 16-1)
+    .inputChanStr_16          = ""
+    #if (16 < I2S_CHANS_ADC+1)
+        "Analogue 16"
+    #endif
+    #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (16 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(16 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(16 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((16 < ADAT_RX_INDEX+8+1) && (16 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (16 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(16 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(16 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(16 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(16 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(16 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(16 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(16 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(16 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 17-1)
+    .inputChanStr_17          = ""
+    #if (17 < I2S_CHANS_ADC+1)
+        "Analogue 17"
+    #endif
+    #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (17 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(17 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(17 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((17 < ADAT_RX_INDEX+8+1) && (17 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (17 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(17 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(17 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(17 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(17 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(17 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(17 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(17 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(17 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 18-1)
+    .inputChanStr_18          = ""
+    #if (18 < I2S_CHANS_ADC+1)
+        "Analogue 18"
+    #endif
+    #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (18 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(18 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(18 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((18 < ADAT_RX_INDEX+8+1) && (18 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (18 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(18 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(18 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(18 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(18 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(18 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(18 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(18 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(18 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 19-1)
+    .inputChanStr_19          = ""
+    #if (19 < I2S_CHANS_ADC+1)
+        "Analogue 19"
+    #endif
+    #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (19 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(19 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(19 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((19 < ADAT_RX_INDEX+8+1) && (19 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (19 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(19 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(19 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(19 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(19 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(19 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(19 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(19 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(19 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 20-1)
+    .inputChanStr_20          = ""
+    #if (20 < I2S_CHANS_ADC+1)
+        "Analogue 20"
+    #endif
+    #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (20 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(20 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(20 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((20 < ADAT_RX_INDEX+8+1) && (20 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (20 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(20 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(20 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(20 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(20 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(20 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(20 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(20 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(20 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 21-1)
+    .inputChanStr_21          = ""
+    #if (21 < I2S_CHANS_ADC+1)
+        "Analogue 21"
+    #endif
+    #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (21 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(21 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(21 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((21 < ADAT_RX_INDEX+8+1) && (21 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (21 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(21 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(21 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(21 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(21 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(21 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(21 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(21 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(21 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 22-1)
+    .inputChanStr_22          = ""
+    #if (22 < I2S_CHANS_ADC+1)
+        "Analogue 22"
+    #endif
+    #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (22 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(22 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(22 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((22 < ADAT_RX_INDEX+8+1) && (22 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (22 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(22 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(22 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(22 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(22 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(22 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(22 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(22 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(22 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 23-1)
+    .inputChanStr_23          = ""
+    #if (23 < I2S_CHANS_ADC+1)
+        "Analogue 23"
+    #endif
+    #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (23 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(23 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(23 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((23 < ADAT_RX_INDEX+8+1) && (23 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (23 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(23 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(23 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(23 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(23 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(23 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(23 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(23 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(23 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 24-1)
+    .inputChanStr_24          = ""
+    #if (24 < I2S_CHANS_ADC+1)
+        "Analogue 24"
+    #endif
+    #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (24 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(24 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(24 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((24 < ADAT_RX_INDEX+8+1) && (24 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (24 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(24 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(24 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(24 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(24 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(24 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(24 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(24 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(24 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 25-1)
+    .inputChanStr_25          = ""
+    #if (25 < I2S_CHANS_ADC+1)
+        "Analogue 25"
+    #endif
+    #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (25 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(25 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(25 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((25 < ADAT_RX_INDEX+8+1) && (25 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (25 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(25 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(25 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(25 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(25 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(25 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(25 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(25 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(25 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 26-1)
+    .inputChanStr_26          = ""
+    #if (26 < I2S_CHANS_ADC+1)
+        "Analogue 26"
+    #endif
+    #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (26 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(26 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(26 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((26 < ADAT_RX_INDEX+8+1) && (26 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (26 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(26 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(26 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(26 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(26 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(26 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(26 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(26 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(26 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 27-1)
+    .inputChanStr_27          = ""
+    #if (27 < I2S_CHANS_ADC+1)
+        "Analogue 27"
+    #endif
+    #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (27 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(27 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(27 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((27 < ADAT_RX_INDEX+8+1) && (27 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (27 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(27 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(27 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(27 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(27 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(27 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(27 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(27 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(27 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 28-1)
+    .inputChanStr_28          = ""
+    #if (28 < I2S_CHANS_ADC+1)
+        "Analogue 28"
+    #endif
+    #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (28 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(28 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(28 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((28 < ADAT_RX_INDEX+8+1) && (28 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (28 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(28 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(28 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(28 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(28 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(28 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(28 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(28 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(28 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 29-1)
+    .inputChanStr_29          = ""
+    #if (29 < I2S_CHANS_ADC+1)
+        "Analogue 29"
+    #endif
+    #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (29 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(29 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(29 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((29 < ADAT_RX_INDEX+8+1) && (29 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (29 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(29 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(29 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(29 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(29 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(29 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(29 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(29 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(29 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 30-1)
+    .inputChanStr_30          = ""
+    #if (30 < I2S_CHANS_ADC+1)
+        "Analogue 30"
+    #endif
+    #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (30 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(30 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(30 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((30 < ADAT_RX_INDEX+8+1) && (30 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (30 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(30 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(30 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(30 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(30 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(30 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(30 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(30 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(30 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 31-1)
+    .inputChanStr_31          = ""
+    #if (31 < I2S_CHANS_ADC+1)
+        "Analogue 31"
+    #endif
+    #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (31 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(31 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(31 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((31 < ADAT_RX_INDEX+8+1) && (31 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (31 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(31 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(31 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(31 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(31 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(31 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(31 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(31 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(31 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
+#if (NUM_USB_CHAN_IN > 32-1)
+    .inputChanStr_32          = ""
+    #if (32 < I2S_CHANS_ADC+1)
+        "Analogue 32"
+    #endif
+    #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (32 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(32 - SPDIF_RX_INDEX == 1)
+            "SPDIF 1"
+        #elif(32 - SPDIF_RX_INDEX == 2)
+            "SPDIF 2"
+        #endif
+    #endif
+    #if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (32 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(32 - ADAT_TX_INDEX == 1)
+            "ADAT 1"
+        #elif(32 - ADAT_TX_INDEX == 2)
+            "ADAT 2"
+        #elif(32 - ADAT_TX_INDEX == 3)
+            "ADAT 3"
+        #elif(32 - ADAT_TX_INDEX == 4)
+            "ADAT 4"
+        #elif(32 - ADAT_TX_INDEX == 5)
+            "ADAT 5"
+        #elif(32 - ADAT_TX_INDEX == 6)
+            "ADAT 6"
+        #elif(32 - ADAT_TX_INDEX == 7)
+            "ADAT 7"
+        #elif(32 - ADAT_TX_INDEX == 8)
+            "ADAT 8"
+        #endif
+     #endif
+        ,
+#endif
+
diff --git a/module_usb_audio/endpoint0/descriptor_defs.h b/module_usb_audio/endpoint0/descriptor_defs.h
new file mode 100644
index 00000000..390a66b0
--- /dev/null
+++ b/module_usb_audio/endpoint0/descriptor_defs.h
@@ -0,0 +1,61 @@
+
+#ifndef __DESCRIPTOR_DEFS_H__
+#define __DESCRIPTOR_DEFS_H__
+
+#if (NUM_USB_CHAN_IN > 0) && (NUM_USB_CHAN_OUT > 0)
+#define AUDIO_INTERFACE_COUNT 3
+#elif (NUM_USB_CHAN_IN > 0) || (NUM_USB_CHAN_OUT > 0)
+#define AUDIO_INTERFACE_COUNT 2
+#else
+#define AUDIO_INTERFACE_COUNT 1
+#endif
+
+/* Endpoint address defines */
+#define ENDPOINT_ADDRESS_IN_CONTROL               (ENDPOINT_NUMBER_IN_CONTROL | 0x80)
+#define ENDPOINT_ADDRESS_IN_FEEDBACK              (ENDPOINT_NUMBER_IN_FEEDBACK | 0x80)
+#define ENDPOINT_ADDRESS_IN_AUDIO                 (ENDPOINT_NUMBER_IN_AUDIO | 0x80)
+#define ENDPOINT_ADDRESS_IN_INTERRUPT             (ENDPOINT_NUMBER_IN_INTERRUPT | 0x80)
+#define ENDPOINT_ADDRESS_IN_MIDI                  (ENDPOINT_NUMBER_IN_MIDI | 0x80)
+#define ENDPOINT_ADDRESS_IN_HID                   (ENDPOINT_NUMBER_IN_HID | 0x80)
+#define ENDPOINT_ADDRESS_IN_IAP_INT               (ENDPOINT_NUMBER_IN_IAP_INT | 0x80)
+#define ENDPOINT_ADDRESS_IN_IAP                   (ENDPOINT_NUMBER_IN_IAP | 0x80)
+#define ENDPOINT_ADDRESS_IN_IAP_EA_NATIVE_TRANS   (ENDPOINT_NUMBER_IN_IAP_EA_NATIVE_TRANS | 0x80)
+
+#define ENDPOINT_ADDRESS_OUT_CONTROL              (ENDPOINT_NUMBER_OUT_CONTROL)
+#define ENDPOINT_ADDRESS_OUT_AUDIO                (ENDPOINT_NUMBER_OUT_AUDIO)
+#define ENDPOINT_ADDRESS_OUT_MIDI                 (ENDPOINT_NUMBER_OUT_MIDI)
+#define ENDPOINT_ADDRESS_OUT_IAP                  (ENDPOINT_NUMBER_OUT_IAP)
+#define ENDPOINT_ADDRESS_OUT_IAP_EA_NATIVE_TRANS  (ENDPOINT_NUMBER_OUT_IAP_EA_NATIVE_TRANS)
+
+
+
+/* Interface numbers enum */
+enum USBInterfaceNumber
+{
+    INTERFACE_NUMBER_AUDIO_CONTROL = 0,
+#if (NUM_USB_CHAN_OUT > 0)
+    INTERFACE_NUMBER_AUDIO_OUTPUT,
+#endif
+#if (NUM_USB_CHAN_IN > 0)
+    INTERFACE_NUMBER_AUDIO_INPUT,
+#endif
+#if defined(MIDI) && (MIDI != 0)
+    INTERFACE_NUMBER_MIDI_CONTROL,
+    INTERFACE_NUMBER_MIDI_STREAM,
+#endif
+#if defined(DFU) && (DFU != 0)
+    INTERFACE_NUMBER_DFU,
+#endif
+#if defined(IAP) && (IAP != 0)
+    INTERFACE_NUMBER_IAP,
+#if defined(IAP_EA_NATIVE_TRANS) && (IAP_EA_NATIVE_TRANS != 0)
+    INTERFACE_NUMBER_IAP_EA_NATIVE_TRANS,
+#endif
+#endif
+#if defined(HID_CONTROLS) && (HID_CONTROLS != 0)
+    INTERFACE_NUMBER_HID,
+#endif
+    INTERFACE_COUNT          /* End marker */
+};
+
+#endif
diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 77a0278d..339c8c92 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -7,10 +7,14 @@
 #ifndef _DEVICE_DESCRIPTORS_
 #define _DEVICE_DESCRIPTORS_
 
+#include <stddef.h>
 #include "devicedefines.h"          /* Device specific define */
+#include "descriptor_defs.h"
 #include "usbaudio20.h"             /* Defines from the USB Audio 2.0 Specifications */
 #include "usbaudiocommon.h"
 #include "usb_std_descriptors.h"
+#include "usbaudio20.h"          /* Defines from USB Audio 2.0 spec */
+#include "usb_defs.h"
 
 #ifdef IAP_EA_NATIVE_TRANS
 #include "iap2.h"                   /* Defines iAP EA Native Transport protocol name */
@@ -24,6 +28,7 @@
 
 #define STR_TABLE_ENTRY(name) char *name
 
+#if __STDC__
 typedef struct
 {
     STR_TABLE_ENTRY(langID);
@@ -325,1146 +330,11 @@ StringDescTable_t g_strTable =
     .midiOutStr                   = APPEND_VENDOR_STR(MIDI Out),
     .midiInStr                    = APPEND_VENDOR_STR(MIDI In),
 #endif
-#if (NUM_USB_CHAN_OUT > 0)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 0)
-    #if defined(SPDIF) && (SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    /* I2S/SPDIF overlap */
-    .outputChanStr_1             = "Analogue 1/SPDIF 1",
-    #else
-    .outputChanStr_1             = "S/PDIF 1",
-    #endif
-#else
-    .outputChanStr_1             = "Analogue 1",
-#endif
-#endif
 
-#if (NUM_USB_CHAN_OUT > 1)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 1)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_2             = "Analogue 2/SPDIF 1",
-    #else
-    .outputChanStr_2             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 0)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_2             = "Analogue 2/SPDIF 2",
-    #else
-    .outputChanStr_2             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_2             = "Analogue 2",
-#endif
-#endif
-#if (NUM_USB_CHAN_OUT > 2)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 2)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_3             = "Analogue 3/SPDIF 1",
-    #else
-    .outputChanStr_3             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 1)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_3             = "Analogue 3/SPDIF 2",
-    #else
-    .outputChanStr_3             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_3             = "Analogue 3",
-    #endif
-#endif
-#if (NUM_USB_CHAN_OUT > 3)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 3)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_4             = "Analogue 4/SPDIF 1",
-    #else
-    .outputChanStr_4             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 2)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_4             = "Analogue 4/SPDIF 2",
-    #else
-    .outputChanStr_4             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_4             = "Analogue 4",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 4)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 4)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_5             = "Analogue 5/SPDIF 1",
-    #else
-    .outputChanStr_5             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 3)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_5             = "Analogue 5/SPDIF 2",
-    #else
-    .outputChanStr_5             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_5             = "Analogue 5",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 5)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 5)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_6             = "Analogue 6/SPDIF 1",
-    #else
-    .outputChanStr_6             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 4)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_6             = "Analogue 6/SPDIF 2",
-    #else
-    .outputChanStr_6             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_6             = "Analogue 6",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 6)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 6)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_7             = "Analogue 7/SPDIF 1",
-    #else
-    .outputChanStr_7             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 5)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_7             = "Analogue 7/SPDIF 2",
-    #else
-    .outputChanStr_7             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_7             = "Analogue 7",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 7)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 7)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_8             = "Analogue 8/SPDIF 1",
-    #else
-    .outputChanStr_8             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 6)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_8             = "Analogue 8/SPDIF 2",
-    #else
-    .outputChanStr_8             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_8             = "Analogue 8",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 8)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 8)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_9             = "Analogue 9/SPDIF 1",
-    #else
-    .outputChanStr_9             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 7)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_9             = "Analogue 9/SPDIF 2",
-    #else
-    .outputChanStr_9             = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_9             = "Analogue 9",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 9)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 9)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_10            = "Analogue 10/SPDIF 1",
-    #else
-    .outputChanStr_10            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 8)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_10            = "Analogue 10/SPDIF 2",
-    #else
-    .outputChanStr_10            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_10            = "Analogue 10",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 10)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 10)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_11            = "Analogue 11/SPDIF 1",
-    #else
-    .outputChanStr_11            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 9)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_11            = "Analogue 11/SPDIF 2",
-    #else
-    .outputChanStr_11            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_11            = "Analogue 11",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 11)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 11)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_12            = "Analogue 12/SPDIF 1",
-    #else
-    .outputChanStr_12            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 10)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_12            = "Analogue 12/SPDIF 2",
-    #else
-    .outputChanStr_12            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_12            = "Analogue 12",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 12)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 12)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_13            = "Analogue 13/SPDIF 1",
-    #else
-    .outputChanStr_13            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 11)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_13            = "Analogue 13/SPDIF 2",
-    #else
-    .outputChanStr_13            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_13            = "Analogue 13",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 13)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 13)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_14            = "Analogue 14/SPDIF 1",
-    #else
-    .outputChanStr_14            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 12)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_14            = "Analogue 14/SPDIF 2",
-    #else
-    .outputChanStr_14            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_14            = "Analogue 14",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 14)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 14)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_15            = "Analogue 15/SPDIF 1",
-    #else
-    .outputChanStr_15            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 13)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_15            = "Analogue 15/SPDIF 2",
-    #else
-    .outputChanStr_15            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_15            = "Analogue 15",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 15)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 15)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_16            = "Analogue 16/SPDIF 1",
-    #else
-    .outputChanStr_16            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 14)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_16            = "Analogue 16/SPDIF 2",
-    #else
-    .outputChanStr_16            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_16            = "Analogue 16",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 16)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 16)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_17            = "Analogue 17/SPDIF 1",
-    #else
-    .outputChanStr_17            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 15)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_17            = "Analogue 17/SPDIF 2",
-    #else
-    .outputChanStr_17            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_17            = "Analogue 17",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 17)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 17)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_18            = "Analogue 18/SPDIF 1",
-    #else
-    .outputChanStr_18            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 16)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_18            = "Analogue 18/SPDIF 2",
-    #else
-    .outputChanStr_18            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_18            = "Analogue 18",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 18)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 18)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_19           = "Analogue 19/SPDIF 1",
-    #else
-    .outputChanStr_19            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 17)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_19            = "Analogue 19/SPDIF 2",
-    #else
-    .outputChanStr_19            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_19            = "Analogue 19",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 19)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 19)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_20           = "Analogue 20/SPDIF 1",
-    #else
-    .outputChanStr_20            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 18)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_20            = "Analogue 20/SPDIF 2",
-    #else
-    .outputChanStr_20            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_20            = "Analogue 20",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 20)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 20)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_21           = "Analogue 21/SPDIF 1",
-    #else
-    .outputChanStr_21            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 19)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_21            = "Analogue 21/SPDIF 2",
-    #else
-    .outputChanStr_21            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_21            = "Analogue 21",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 21)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 21)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_22           = "Analogue 22/SPDIF 1",
-    #else
-    .outputChanStr_22            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 20)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_22            = "Analogue 22/SPDIF 2",
-    #else
-    .outputChanStr_22            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_22            = "Analogue 22",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 22)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 22)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_23           = "Analogue 23/SPDIF 1",
-    #else
-    .outputChanStr_23            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 21)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_23            = "Analogue 23/SPDIF 2",
-    #else
-    .outputChanStr_23            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_23            = "Analogue 23",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 23)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 23)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_24           = "Analogue 24/SPDIF 1",
-    #else
-    .outputChanStr_24            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 22)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_24            = "Analogue 24/SPDIF 2",
-    #else
-    .outputChanStr_24            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_24            = "Analogue 24",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 24)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 24)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_25           = "Analogue 25/SPDIF 1",
-    #else
-    .outputChanStr_25            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 23)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_25            = "Analogue 25/SPDIF 2",
-    #else
-    .outputChanStr_25            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_25            = "Analogue 25",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 25)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 25)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_26           = "Analogue 26/SPDIF 1",
-    #else
-    .outputChanStr_26            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 24)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_26            = "Analogue 26/SPDIF 2",
-    #else
-    .outputChanStr_26            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_26            = "Analogue 26",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 26)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 26)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_27           = "Analogue 27/SPDIF 1",
-    #else
-    .outputChanStr_27            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 25)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_27            = "Analogue 27/SPDIF 2",
-    #else
-    .outputChanStr_27            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_27            = "Analogue 27",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 27)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 28)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_28           = "Analogue 28/SPDIF 1",
-    #else
-    .outputChanStr_28            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 27)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_28            = "Analogue 28/SPDIF 2",
-    #else
-    .outputChanStr_28            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_28            = "Analogue 28",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 28)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 29)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_29           = "Analogue 29/SPDIF 1",
-    #else
-    .outputChanStr_29            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 28)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_29            = "Analogue 29/SPDIF 2",
-    #else
-    .outputChanStr_29            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_29            = "Analogue 29",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 29)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 30)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_30           = "Analogue 30/SPDIF 1",
-    #else
-    .outputChanStr_30            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 29)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_30            = "Analogue 30/SPDIF 2",
-    #else
-    .outputChanStr_30            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_30            = "Analogue 30",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 30)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 31)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_31           = "Analogue 31/SPDIF 1",
-    #else
-    .outputChanStr_31            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 30)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_31            = "Analogue 31/SPDIF 2",
-    #else
-    .outputChanStr_31            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_31            = "Analogue 31",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_OUT > 31)
-#if defined(SPDIF) && (SPDIF_TX_INDEX == 32)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_32            = "Analogue 32/SPDIF 1",
-    #else
-    .outputChanStr_32            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF) && (SPDIF_TX_INDEX == 32)
-    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
-    .outputChanStr_32            = "Analogue 32/SPDIF 2",
-    #else
-    .outputChanStr_32            = "S/PDIF 2",
-    #endif
-#else
-    .outputChanStr_32            = "Analogue 32",
-#endif
-#endif
+    #include "chanstrings.h"
 
 #if (NUM_USB_CHAN_OUT > 32)
-#error NUM_USB_CHAN > 32
-#endif
-
-/*** INPUT CHANNEL STRINGS ***/
-
-#if (NUM_USB_CHAN_IN > 0)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 0)
-    #if defined(SPDIF_RX) && (SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    /* I2S/SPDIF overlap */
-    .inputChanStr_1             = "Analogue 1/SPDIF 1",
-    #else
-    .inputChanStr_1             = "S/PDIF 1",
-    #endif
-#else
-    .inputChanStr_1             = "Analogue 1",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 1)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 1)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_2             = "Analogue 2/SPDIF 1",
-    #else
-    .inputChanStr_2             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 0)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_2             = "Analogue 2/SPDIF 2",
-    #else
-    .inputChanStr_2             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_2             = "Analogue 2",
-#endif
-#endif
-#if (NUM_USB_CHAN_IN > 2)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 2)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_3             = "Analogue 3/SPDIF 1",
-    #else
-    .inputChanStr_3             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 1)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_3             = "Analogue 3/SPDIF 2",
-    #else
-    .inputChanStr_3             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_3             = "Analogue 3",
-    #endif
-#endif
-#if (NUM_USB_CHAN_IN > 3)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 3)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_4             = "Analogue 4/SPDIF 1",
-    #else
-    .inputChanStr_4             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 2)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_4             = "Analogue 4/SPDIF 2",
-    #else
-    .inputChanStr_4             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_4             = "Analogue 4",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 4)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 4)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_5             = "Analogue 5/SPDIF 1",
-    #else
-    .inputChanStr_5             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 3)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_5             = "Analogue 5/SPDIF 2",
-    #else
-    .inputChanStr_5             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_5             = "Analogue 5",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 5)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 5)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_6             = "Analogue 6/SPDIF 1",
-    #else
-    .inputChanStr_6             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 4)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_6             = "Analogue 6/SPDIF 2",
-    #else
-    .inputChanStr_6             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_6             = "Analogue 6",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 6)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 6)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_7             = "Analogue 7/SPDIF 1",
-    #else
-    .inputChanStr_7             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 5)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_7             = "Analogue 7/SPDIF 2",
-    #else
-    .inputChanStr_7             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_7             = "Analogue 7",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 7)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 7)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_8             = "Analogue 8/SPDIF 1",
-    #else
-    .inputChanStr_8             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 6)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_8             = "Analogue 8/SPDIF 2",
-    #else
-    .inputChanStr_8             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_8             = "Analogue 8",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 8)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 8)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_9             = "Analogue 9/SPDIF 1",
-    #else
-    .inputChanStr_9             = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 7)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_9             = "Analogue 9/SPDIF 2",
-    #else
-    .inputChanStr_9             = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_9             = "Analogue 9",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 9)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 9)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_10            = "Analogue 10/SPDIF 1",
-    #else
-    .inputChanStr_10            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 8)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_10            = "Analogue 10/SPDIF 2",
-    #else
-    .inputChanStr_10            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_10            = "Analogue 10",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 10)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 10)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_11            = "Analogue 11/SPDIF 1",
-    #else
-    .inputChanStr_11            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 9)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_11            = "Analogue 11/SPDIF 2",
-    #else
-    .inputChanStr_11            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_11            = "Analogue 11",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 11)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 11)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_12            = "Analogue 12/SPDIF 1",
-    #else
-    .inputChanStr_12            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 10)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_12            = "Analogue 12/SPDIF 2",
-    #else
-    .inputChanStr_12            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_12            = "Analogue 12",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 12)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 12)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_13            = "Analogue 13/SPDIF 1",
-    #else
-    .inputChanStr_13            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 11)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_13            = "Analogue 13/SPDIF 2",
-    #else
-    .inputChanStr_13            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_13            = "Analogue 13",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 13)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 13)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_14            = "Analogue 14/SPDIF 1",
-    #else
-    .inputChanStr_14            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 12)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_14            = "Analogue 14/SPDIF 2",
-    #else
-    .inputChanStr_14            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_14            = "Analogue 14",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 14)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 14)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_15            = "Analogue 15/SPDIF 1",
-    #else
-    .inputChanStr_15            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 13)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_15            = "Analogue 15/SPDIF 2",
-    #else
-    .inputChanStr_15            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_15            = "Analogue 15",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 15)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 15)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_16            = "Analogue 16/SPDIF 1",
-    #else
-    .inputChanStr_16            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 14)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_16            = "Analogue 16/SPDIF 2",
-    #else
-    .inputChanStr_16            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_16            = "Analogue 16",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 16)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 16)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_17            = "Analogue 17/SPDIF 1",
-    #else
-    .inputChanStr_17            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 15)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_17            = "Analogue 17/SPDIF 2",
-    #else
-    .inputChanStr_17            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_17            = "Analogue 17",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 17)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 17)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_18            = "Analogue 18/SPDIF 1",
-    #else
-    .inputChanStr_18            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 16)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_18            = "Analogue 18/SPDIF 2",
-    #else
-    .inputChanStr_18            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_18            = "Analogue 18",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 18)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 18)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_19            = "Analogue 19/SPDIF 1",
-    #else
-    .inputChanStr_19            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 17)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_19            = "Analogue 19/SPDIF 2",
-    #else
-    .inputChanStr_19            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_19            = "Analogue 19",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 19)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 19)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_20            = "Analogue 20/SPDIF 1",
-    #else
-    .inputChanStr_20            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 18)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_20            = "Analogue 20/SPDIF 2",
-    #else
-    .inputChanStr_20            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_20            = "Analogue 20",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 20)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 20)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_21            = "Analogue 21/SPDIF 1",
-    #else
-    .inputChanStr_21            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 19)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_21            = "Analogue 21/SPDIF 2",
-    #else
-    .inputChanStr_21            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_21            = "Analogue 21",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 21)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 21)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_22            = "Analogue 22/SPDIF 1",
-    #else
-    .inputChanStr_22            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 20)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_22            = "Analogue 22/SPDIF 2",
-    #else
-    .inputChanStr_22            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_22            = "Analogue 22",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 22)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 22)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_23            = "Analogue 23/SPDIF 1",
-    #else
-    .inputChanStr_23            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 21)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_23            = "Analogue 23/SPDIF 2",
-    #else
-    .inputChanStr_23            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_23            = "Analogue 23",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 23)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 23)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_24            = "Analogue 24/SPDIF 1",
-    #else
-    .inputChanStr_24            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 22)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_24            = "Analogue 24/SPDIF 2",
-    #else
-    .inputChanStr_24            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_24            = "Analogue 24",
-#endif
-#endif
-#if (NUM_USB_CHAN_IN > 24)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 24)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_25            = "Analogue 25/SPDIF 1",
-    #else
-    .inputChanStr_25            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 23)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_25            = "Analogue 25/SPDIF 2",
-    #else
-    .inputChanStr_25            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_25            = "Analogue 25",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 25)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 25)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_26            = "Analogue 26/SPDIF 1",
-    #else
-    .inputChanStr_26            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 24)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_26            = "Analogue 26/SPDIF 2",
-    #else
-    .inputChanStr_26            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_26            = "Analogue 26",
-#endif
-#endif
-#if (NUM_USB_CHAN_IN > 26)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 26)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_27            = "Analogue 27/SPDIF 1",
-    #else
-    .inputChanStr_27            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 25)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_27            = "Analogue 27/SPDIF 2",
-    #else
-    .inputChanStr_27            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_27            = "Analogue 27",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 27)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 27)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_28            = "Analogue 28/SPDIF 1",
-    #else
-    .inputChanStr_28            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 26)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_28            = "Analogue 28/SPDIF 2",
-    #else
-    .inputChanStr_28            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_28            = "Analogue 28",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 28)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 28)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_29            = "Analogue 29/SPDIF 1",
-    #else
-    .inputChanStr_29            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 27)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_29            = "Analogue 29/SPDIF 2",
-    #else
-    .inputChanStr_29            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_29            = "Analogue 29",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 29)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 29)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_30            = "Analogue 30/SPDIF 1",
-    #else
-    .inputChanStr_30            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 28)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_30            = "Analogue 30/SPDIF 2",
-    #else
-    .inputChanStr_30            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_30            = "Analogue 30",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 30)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 30)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_31            = "Analogue 31/SPDIF 1",
-    #else
-    .inputChanStr_31            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 29)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_31            = "Analogue 31/SPDIF 2",
-    #else
-    .inputChanStr_31            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_31            = "Analogue 31",
-#endif
-#endif
-
-#if (NUM_USB_CHAN_IN > 31)
-#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 31)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_32            = "Analogue 32/SPDIF 1",
-    #else
-    .inputChanStr_32            = "S/PDIF 1",
-    #endif
-#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 30)
-    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
-    .inputChanStr_32            = "Analogue 32/SPDIF 2",
-    #else
-    .inputChanStr_32            = "S/PDIF 2",
-    #endif
-#else
-    .inputChanStr_32            = "Analogue 32",
-#endif
+#error NUM_USB_CHAN_OUT > 32
 #endif
 
 #if (NUM_USB_CHAN_IN > 32)
@@ -1474,25 +344,25 @@ StringDescTable_t g_strTable =
 #if defined(MIXER) && (MAX_MIX_COUNT > 0)
     .mixOutStr_1                 = "Mix 1",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 1)
     .mixOutStr_2                 = "Mix 2",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 2)
     .mixOutStr_3                 = "Mix 3",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 3)
     .mixOutStr_4                 = "Mix 4",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 4)
     .mixOutStr_5                 = "Mix 5",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 5)
     .mixOutStr_6                 = "Mix 6",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 6)
     .mixOutStr_7                 = "Mix 7",
 #endif
-#if defined(MIXER) && (MAX_MIX_COUNT > 0)
+#if defined(MIXER) && (MAX_MIX_COUNT > 7)
     .mixOutStr_8                 = "Mix 8",
 #endif
 #if defined(MIXER) && (MAX_MIX_COUNT > 8)
@@ -1504,60 +374,6 @@ StringDescTable_t g_strTable =
 #endif
 };
 
-/* Interface numbers enum */
-enum USBInterfaceNumber
-{
-    INTERFACE_NUMBER_AUDIO_CONTROL = 0,
-#if (NUM_USB_CHAN_OUT > 0)
-    INTERFACE_NUMBER_AUDIO_OUTPUT,
-#endif
-#if (NUM_USB_CHAN_IN > 0)
-    INTERFACE_NUMBER_AUDIO_INPUT,
-#endif
-#if defined(MIDI) && (MIDI != 0)
-    INTERFACE_NUMBER_MIDI_CONTROL,
-    INTERFACE_NUMBER_MIDI_STREAM,
-#endif
-#if defined(DFU) && (DFU != 0)
-    INTERFACE_NUMBER_DFU,
-#endif
-#if defined(IAP) && (IAP != 0)
-    INTERFACE_NUMBER_IAP,
-#if defined(IAP_EA_NATIVE_TRANS) && (IAP_EA_NATIVE_TRANS != 0)
-    INTERFACE_NUMBER_IAP_EA_NATIVE_TRANS,
-#endif
-#endif
-#if defined(HID_CONTROLS) && (HID_CONTROLS != 0)
-    INTERFACE_NUMBER_HID,
-#endif
-    INTERFACE_COUNT          /* End marker */
-};
-
-#if (NUM_USB_CHAN_IN > 0) && (NUM_USB_CHAN_OUT > 0)
-#define AUDIO_INTERFACE_COUNT 3
-#elif (NUM_USB_CHAN_IN > 0) || (NUM_USB_CHAN_OUT > 0)
-#define AUDIO_INTERFACE_COUNT 2
-#else
-#define AUDIO_INTERFACE_COUNT 1
-#endif
-
-/* Endpoint address defines */
-#define ENDPOINT_ADDRESS_IN_CONTROL               (ENDPOINT_NUMBER_IN_CONTROL | 0x80)
-#define ENDPOINT_ADDRESS_IN_FEEDBACK              (ENDPOINT_NUMBER_IN_FEEDBACK | 0x80)
-#define ENDPOINT_ADDRESS_IN_AUDIO                 (ENDPOINT_NUMBER_IN_AUDIO | 0x80)
-#define ENDPOINT_ADDRESS_IN_INTERRUPT             (ENDPOINT_NUMBER_IN_INTERRUPT | 0x80)
-#define ENDPOINT_ADDRESS_IN_MIDI                  (ENDPOINT_NUMBER_IN_MIDI | 0x80)
-#define ENDPOINT_ADDRESS_IN_HID                   (ENDPOINT_NUMBER_IN_HID | 0x80)
-#define ENDPOINT_ADDRESS_IN_IAP_INT               (ENDPOINT_NUMBER_IN_IAP_INT | 0x80)
-#define ENDPOINT_ADDRESS_IN_IAP                   (ENDPOINT_NUMBER_IN_IAP | 0x80)
-#define ENDPOINT_ADDRESS_IN_IAP_EA_NATIVE_TRANS   (ENDPOINT_NUMBER_IN_IAP_EA_NATIVE_TRANS | 0x80)
-
-#define ENDPOINT_ADDRESS_OUT_CONTROL              (ENDPOINT_NUMBER_OUT_CONTROL)
-#define ENDPOINT_ADDRESS_OUT_AUDIO                (ENDPOINT_NUMBER_OUT_AUDIO)
-#define ENDPOINT_ADDRESS_OUT_MIDI                 (ENDPOINT_NUMBER_OUT_MIDI)
-#define ENDPOINT_ADDRESS_OUT_IAP                  (ENDPOINT_NUMBER_OUT_IAP)
-#define ENDPOINT_ADDRESS_OUT_IAP_EA_NATIVE_TRANS  (ENDPOINT_NUMBER_OUT_IAP_EA_NATIVE_TRANS)
-
 /***** Device Descriptors *****/
 
 #if defined(AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS==1)
@@ -1831,7 +647,7 @@ typedef struct
     // USB_Descriptor_Audio_MixerUnit_t          Audio_MixerUnit;
     unsigned char configDesc_MixerUnit[MIXER_LENGTH];
 #endif
-#if defined (SPDIF_RX) || defined (ADAT_RX)
+#if defined(SPDIF_RX) || defined(ADAT_RX)
     /* Interrupt EP */
     USB_Descriptor_Endpoint_t                   Audio_Int_Endpoint;
 #endif
@@ -2086,7 +902,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
             ID_CLKSRC_ADAT,            /* baCSourceID */
 #endif
             .bmControl                 = 0x03,
-            .iClockSelector            = 13, /* TODO Shoudn't be hard-coded */
+            .iClockSelector            = offsetof(StringDescTable_t, clockSelectorStr)/sizeof(char *),
         },
 
 #if (NUM_USB_CHAN_OUT > 0)
@@ -3705,3 +2521,4 @@ unsigned char cfgDesc_Audio1[] =
 
 #endif
 #endif
+#endif
diff --git a/module_usb_audio/endpoint0/endpoint0.c b/module_usb_audio/endpoint0/endpoint0.c
index 3b89073c..abe22824 100755
--- a/module_usb_audio/endpoint0/endpoint0.c
+++ b/module_usb_audio/endpoint0/endpoint0.c
@@ -49,19 +49,19 @@
 #warning MIDI is currently not supported and will not be enabled in AUDIO 1.0 mode
 #endif
 
-/* If PID_DFU not defined, standard PID used.. this is probably what we want.. */
-#ifndef PID_DFU
-#warning PID_DFU not defined, Using PID_AUDIO_2. This is probably fine!
+/* If DFU_PID not defined, standard PID used.. this is probably what we want.. */
+#ifndef DFU_PID
+#warning DFU_PID not defined, Using PID_AUDIO_2. This is probably fine!
 #endif
 
 #ifdef DFU
 #include "dfu.h"
 #define DFU_IF_NUM INPUT_INTERFACES + OUTPUT_INTERFACES + MIDI_INTERFACES + 1
-
-unsigned int DFU_mode_active = 0;         // 0 - App active, 1 - DFU active
 extern void device_reboot(chanend);
 #endif
 
+unsigned int DFU_mode_active = 0;         // 0 - App active, 1 - DFU active
+
 /* Global volume and mute tables */
 int volsOut[NUM_USB_CHAN_OUT + 1];
 unsigned int mutesOut[NUM_USB_CHAN_OUT + 1];
@@ -204,7 +204,7 @@ const unsigned g_chanCount_In_HS[INPUT_FORMAT_COUNT]       = {HS_STREAM_FORMAT_I
 
 /* Endpoint 0 function.  Handles all requests to the device */
 void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
-    chanend c_mix_ctl, chanend c_clk_ctl, chanend c_EANativeTransport_ctrl)
+    chanend c_mix_ctl, chanend c_clk_ctl, chanend c_EANativeTransport_ctrl, CLIENT_INTERFACE(i_dfu, dfuInterface))
 {
     USB_SetupPacket_t sp;
     XUD_ep ep0_out = XUD_InitEp(c_ep0_out);
@@ -296,11 +296,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
     while(1)
     {
         /* Returns XUD_RES_OKAY for success, XUD_RES_RST for bus reset */
-#if defined(__XC__)
-        XUD_Result_t result = USB_GetSetupPacket(ep0_out, ep0_in, sp);
-#else
         XUD_Result_t result = USB_GetSetupPacket(ep0_out, ep0_in, &sp);
-#endif
 
         if (result == XUD_RES_OKAY)
         {
@@ -562,6 +558,8 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
 
                         if (interfaceNum == DFU_IF)
                         {
+                            int reset = 0;
+
                             /* If running in application mode stop audio */
                             /* Don't interupt audio for save and restore cmds */
                             if ((DFU_IF == INTERFACE_NUMBER_DFU) && (sp.bRequest != XMOS_DFU_SAVESTATE) &&
@@ -573,27 +571,22 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
                                 // Handshake
 							    chkct(c_audioControl, XS1_CT_END);
                             }
-#ifdef __XC__
+
                             /* This will return 1 if reset requested */
-                            if (DFUDeviceRequests(ep0_out, ep0_in, sp, null, g_interfaceAlt[sp.wIndex], 1))
-#else
-                            /* This will return 1 if reset requested */
-                            if (DFUDeviceRequests(ep0_out, &ep0_in, &sp, null, g_interfaceAlt[sp.wIndex], 1))
-#endif
+                            result = DFUDeviceRequests(ep0_out, &ep0_in, &sp, null, g_interfaceAlt[sp.wIndex], dfuInterface, &reset);
+
+                            if(reset)
                             {
                                 DFUDelay(50000000);
                                 device_reboot(c_audioControl);
                             }
-
-                            /* TODO we should not make the assumption that all DFU requests are handled */
-                            result = 0;
                         }
 #endif
                         /* Check for:   - Audio CONTROL interface request - always 0, note we check for DFU first
                          *              - Audio STREAMING interface request  (In or Out)
                          *              - Audio endpoint request (Audio 1.0 Sampling freq requests are sent to the endpoint)
                          */
-                        if((interfaceNum == 0) || (interfaceNum == 1) || (interfaceNum == 2))
+                        if(((interfaceNum == 0) || (interfaceNum == 1) || (interfaceNum == 2)) && !DFU_mode_active)
 				        {
 #if (AUDIO_CLASS == 2) && defined(AUDIO_CLASS_FALLBACK)
                             if(g_curUsbSpeed == XUD_SPEED_HS)
diff --git a/module_usb_audio/endpoint0/endpoint0.h b/module_usb_audio/endpoint0/endpoint0.h
index 778d0937..ef3afaa8 100644
--- a/module_usb_audio/endpoint0/endpoint0.h
+++ b/module_usb_audio/endpoint0/endpoint0.h
@@ -2,6 +2,8 @@
 #ifndef _ENDPOINT0_H_
 #define _ENDPOINT0_H_
 
+#include "dfu_interface.h"
+
 /** Function implementing Endpoint 0 for enumeration, control and configuration
  *  of USB audio devices. It uses the descriptors defined in ``descriptors_2.h``.
  *
@@ -18,7 +20,7 @@
  *  \param c_EANativeTransport_ctrl Optional chanend to be connected to EA Native
  *                                  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_ctrl);
+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);
 
 #endif
diff --git a/module_usb_audio/flashlib_user.c b/module_usb_audio/flashlib_user.c
index 1ea6b428..ac8387b0 100644
--- a/module_usb_audio/flashlib_user.c
+++ b/module_usb_audio/flashlib_user.c
@@ -1,10 +1,15 @@
 #include "devicedefines.h"
+#include "uac_hwresources.h"
 
 #ifdef DFU
 
 #include <xs1.h>
 #include <xclib.h>
+#ifdef QUAD_SPI_FLASH
+#include <quadflashlib.h>
+#else
 #include <flashlib.h>
+#endif
 #include <print.h>
 
 #define settw(a,b) {__asm__ __volatile__("settw res[%0], %1": : "r" (a) , "r" (b));}
@@ -18,25 +23,46 @@
 fl_DeviceSpec flash_devices[] = {DFU_FLASH_DEVICE};
 #endif
 
+#ifdef QUAD_SPI_FLASH
+/*
+typedef struct {
+      out port qspiCS;
+      out port qspiSCLK;
+      out buffered port:32 qspiSIO;
+      clock qspiClkblk;
+} fl_QSPIPorts;
+*/
+fl_QSPIPorts p_qflash =
+{
+    XS1_PORT_1B,
+    XS1_PORT_1C,
+    XS1_PORT_4B,
+    CLKBLK_FLASHLIB
+};
+#else
 fl_PortHolderStruct p_flash =
 {
     XS1_PORT_1A,
     XS1_PORT_1B,
     XS1_PORT_1C,
     XS1_PORT_1D,
-    XS1_CLKBLK_1
+    CLKBLK_FLASHLIB
 };
+#endif
 
+/* return 1 for opened ports successfully */
 int flash_cmd_enable_ports()
 {
     int result = 0;
+#ifdef QUAD_SPI_FLASH
+    /* Ports not shared */
+#else
     setc(p_flash.spiMISO, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiCLK, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiMOSI, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiSS, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiClkblk, XS1_SETC_INUSE_OFF);
 
-
     setc(p_flash.spiMISO, XS1_SETC_INUSE_ON);
     setc(p_flash.spiCLK, XS1_SETC_INUSE_ON);
     setc(p_flash.spiMOSI, XS1_SETC_INUSE_ON);
@@ -54,15 +80,21 @@ int flash_cmd_enable_ports()
 
     settw(p_flash.spiMISO, 8);
     settw(p_flash.spiMOSI, 8);
+#endif
 
 #ifdef DFU_FLASH_DEVICE
     result = fl_connectToDevice(&p_flash, flash_devices, 1);
 #else
     /* Use default flash list */
+#ifdef QUAD_SPI_FLASH
+    result = fl_connect(&p_qflash);
+#else
     result = fl_connect(&p_flash);
+#endif
 #endif
     if (!result)
     {
+        /* All okay.. */
         return 1;
     }
     else
@@ -75,10 +107,12 @@ int flash_cmd_disable_ports()
 {
     fl_disconnect();
 
+#ifndef QUAD_SPI_FLASH
     setc(p_flash.spiMISO, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiCLK, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiMOSI, XS1_SETC_INUSE_OFF);
     setc(p_flash.spiSS, XS1_SETC_INUSE_OFF);
+#endif
 
     return 1;
 }
diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 9b46c2e2..0f1825e3 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -15,6 +15,7 @@
 #include "xud.h"                 /* XMOS USB Device Layer defines and functions */
 
 #include "devicedefines.h"       /* Device specific defines */
+#include "uac_hwresources.h"
 #include "endpoint0.h"
 #include "usb_buffer.h"
 #include "decouple.h"
@@ -37,11 +38,14 @@
 #endif
 
 #ifdef ADAT_RX
-#include "adatreceiver.h"
+#include "adat_rx.h"
 #endif
 
 #include "clocking.h"
 
+[[distributable]]
+void DFUHandler(server interface i_dfu i, chanend ?c_user_cmd);
+
 /* 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] =
@@ -101,24 +105,7 @@ on tile[AUDIO_IO_TILE] : buffered in port:32 p_i2s_adc[I2S_WIRES_ADC] =
                 };
 #endif
 
-#if (XUD_SERIES_SUPPORT == XUD_L_SERIES) && (AUDIO_IO_TILE == XUD_TILE)
-/* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI
- * if MIDI and XUD on same tile. See XUD documentation.
- *
- * This is a clash with S/PDIF Tx but simultaneous S/PDIF and MIDI not currently supported on single tile device
- *
- */
-/* TODO should include tile here */
-#define CLKBLK_MIDI        XS1_CLKBLK_1;
-#else
-#define CLKBLK_MIDI        XS1_CLKBLK_REF;
-#endif
-#define CLKBLK_ADAT_RX     XS1_CLKBLK_3
-#define CLKBLK_SPDIF_TX    XS1_CLKBLK_1
-#define CLKBLK_SPDIF_RX    XS1_CLKBLK_1
-#define CLKBLK_MCLK        XS1_CLKBLK_2
-#define CLKBLK_I2S_BIT     XS1_CLKBLK_3
-#define CLKBLK_XUD         XS1_CLKBLK_4 /* Note XUD for U-series uses CLKBLK_5 also (see XUD_Ports.xc) */
+
 
 #ifndef CODEC_MASTER
 on tile[AUDIO_IO_TILE] : buffered out port:32 p_lrclk       = PORT_I2S_LRCLK;
@@ -131,8 +118,12 @@ on tile[AUDIO_IO_TILE] : in port p_bclk                     = PORT_I2S_BCLK;
 on tile[AUDIO_IO_TILE] : port p_mclk_in                     = PORT_MCLK_IN;
 on tile[XUD_TILE] : in port p_for_mclk_count                = PORT_MCLK_COUNT;
 
-#ifdef SPDIF
-on tile[AUDIO_IO_TILE] : buffered out port:32 p_spdif_tx    = PORT_SPDIF_OUT;
+#ifdef SPDIF_TX
+on tile[SPDIF_TX_TILE] : buffered out port:32 p_spdif_tx    = PORT_SPDIF_OUT;
+#endif
+
+#ifdef ADAT_TX
+on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx  = PORT_ADAT_OUT;
 #endif
 
 #ifdef ADAT_RX
@@ -149,29 +140,31 @@ 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;
+on tile[MIDI_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[MIDI_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[MIDI_TILE] :  buffered in port:1 p_midi_rx      = PORT_MIDI_IN;
 #endif
 #endif
 
 /* Clock blocks */
 #ifdef MIDI
-on tile[AUDIO_IO_TILE] : clock    clk_midi                  = CLKBLK_MIDI;
+on tile[MIDI_TILE] : clock    clk_midi                  = CLKBLK_MIDI;
 #endif
 
-#ifdef SPDIF
-on tile[AUDIO_IO_TILE] : clock    clk_mst_spd               = CLKBLK_SPDIF_TX;
+#if defined(SPDIF_TX) || defined(ADAT_TX)
+on tile[SPDIF_TX_TILE] : clock    clk_mst_spd               = CLKBLK_SPDIF_TX;
 #endif
 
 #ifdef SPDIF_RX
 on tile[XUD_TILE] : clock    clk_spd_rx                     = CLKBLK_SPDIF_RX;
 #endif
 
-#ifdef ADAT_RX
+#if(XUD_SERIES_SUPPORT == XUD_L_SERIES) && defined(ADAT_RX)
+/* Cannot use default clock (CLKBLK_REF) for ADAT RX since it is tied to the
+60MHz USB clock on G/L series parts. */
 on tile[XUD_TILE] : clock    clk_adat_rx                    = CLKBLK_ADAT_RX;
 #endif
 
@@ -195,17 +188,21 @@ on tile[XUD_TILE] : out port p_usb_rst                      = PORT_USB_RESET;
 #define p_usb_rst   null
 #endif
 
-#if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
+#if (XUD_SERIES_SUPPORT != XUD_U_SERIES && XUD_SERIES_SUPPORT != XUD_X200_SERIES)
 /* L Series also needs a clock block for this port */
-on tile[XUD_TILE] : clock clk                               = CLKBLK_XUD;
+on tile[XUD_TILE] : clock clk                               = CLKBLK_USB_RST;
 #else
 #define clk         null
 #endif
 
 #ifdef IAP
-/* I2C ports - in a struct for use with module_i2s_simple */
+/* I2C ports - in a struct for use with module_i2c_shared & module_i2c_simple/module_i2c_single_port */
+#ifdef PORT_I2C
+on tile [IAP_TILE] : struct r_i2c r_i2c = {PORT_I2C};
+#else
 on tile [IAP_TILE] : struct r_i2c r_i2c = {PORT_I2C_SCL, PORT_I2C_SDA};
 #endif
+#endif
 
 
 /* Endpoint type tables for XUD */
@@ -281,6 +278,7 @@ void usb_audio_core(chanend c_mix_out
 #endif
 , chanend ?c_clk_int
 , chanend ?c_clk_ctl
+, client interface i_dfu dfuInterface
 )
 {
     chan c_sof;
@@ -322,7 +320,7 @@ void usb_audio_core(chanend c_mix_out
 
             /* Attach mclk count port to mclk clock-block (for feedback) */
             //set_port_clock(p_for_mclk_count, clk_audio_mclk);
-#if(AUDIO_IO_TILE != 0)
+#if(AUDIO_IO_TILE != XUD_TILE)
             set_clock_src(clk_audio_mclk2, p_mclk_in2);
             set_port_clock(p_for_mclk_count, clk_audio_mclk2);
             start_clock(clk_audio_mclk2);
@@ -375,7 +373,7 @@ 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, c_clk_ctl, c_EANativeTransport_ctrl);
+            Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl, c_EANativeTransport_ctrl, dfuInterface);
         }
 
         /* Decoupling core */
@@ -392,14 +390,20 @@ void usb_audio_core(chanend c_mix_out
 }
 
 void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
-#ifdef MIXER
-chanend c_mix_ctl,
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+    chanend c_spdif_tx,
+#endif
+#ifdef MIXER
+    chanend c_mix_ctl,
+#endif
+    chanend ?c_aud_cfg,
+    streaming chanend ?c_spdif_rx,
+    chanend ?c_adat_rx,
+    chanend ?c_clk_ctl,
+    chanend ?c_clk_int
+#if (XUD_TILE != 0)
+    , server interface i_dfu dfuInterface
 #endif
-chanend ?c_aud_cfg,
-streaming chanend ?c_spdif_rx,
-chanend ?c_adat_rx,
-chanend ?c_clk_ctl,
-chanend ?c_clk_int
 )
 {
 #ifdef MIXER
@@ -425,18 +429,22 @@ chanend ?c_clk_int
         {
             thread_speed();
 #ifdef MIXER
-            audio(c_mix_out,
-#if defined(SPDIF_RX) || defined(ADAT_RX)
-        c_dig_rx,
-#endif
-        c_aud_cfg, c_adc);
+#define AUDIO_CHANNEL c_mix_out
 #else
-            audio(c_aud_in,
+#define AUDIO_CHANNEL c_aud_in
+#endif
+            audio(AUDIO_CHANNEL,
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+                c_spdif_tx,
+#endif
 #if defined(SPDIF_RX) || defined(ADAT_RX)
-            c_dig_rx,
+                c_dig_rx,
 #endif
-            c_aud_cfg, c_adc);
+                c_aud_cfg, c_adc
+#if XUD_TILE != 0
+                ,dfuInterface
 #endif
+            );
         }
 
 #if defined(SPDIF_RX) || defined(ADAT_RX)
@@ -501,6 +509,11 @@ int main()
 #define c_adat_rx null
 #endif
 
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+    chan c_spdif_tx;
+#endif
+
+
 #if (defined (SPDIF_RX) || defined (ADAT_RX))
     chan c_clk_ctl;
     chan c_clk_int;
@@ -509,33 +522,64 @@ int main()
 #define c_clk_ctl null
 #endif
 
+#ifdef DFU
+    interface i_dfu dfuInterface;
+#else
+    #define dfuInterface null
+#endif
+
+
     USER_MAIN_DECLARATIONS
 
     par
     {
-        on tile[XUD_TILE]: usb_audio_core(c_mix_out
+        on tile[XUD_TILE]:
+        par
+        {
+#if (XUD_TILE == 0)
+            /* Check if USB is on the flash tile (tile 0) */
+            [[distribute]]
+            DFUHandler(dfuInterface, null);
+#endif
+            usb_audio_core(c_mix_out
 #ifdef MIDI
-            , c_midi
+                , c_midi
 #endif
 #ifdef IAP
-            , c_iap
+                , c_iap
 #ifdef IAP_EA_NATIVE_TRANS
-            , c_ea_data
+                , c_ea_data
 #endif
 #endif
 #ifdef MIXER
-            , c_mix_ctl
+                , c_mix_ctl
 #endif
-            , c_clk_int, c_clk_ctl
-);
+                , c_clk_int, c_clk_ctl, dfuInterface
+            );
+        }
 
         on tile[AUDIO_IO_TILE]: usb_audio_io(c_mix_out, c_adc
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+            , c_spdif_tx
+#endif
 #ifdef MIXER
             , c_mix_ctl
 #endif
             ,c_aud_cfg, c_spdif_rx, c_adat_rx, c_clk_ctl, c_clk_int
+#if XUD_TILE != 0
+            , dfuInterface
+#endif
+
         );
 
+#if defined(SPDIF_TX) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
+        on tile[SPDIF_TX_TILE]:
+        {
+            thread_speed();
+            SpdifTxWrapper(c_spdif_tx);
+        }
+#endif
+
 #if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE)
         /* MIDI and IAP share a core */
         on tile[IAP_TILE]:
@@ -562,7 +606,7 @@ int main()
 #endif
 
 #ifdef SPDIF_RX
-        on tile[0]:
+        on tile[XUD_TILE]:
         {
             thread_speed();
             SpdifReceive(p_spdif_rx, c_spdif_rx, 1, clk_spd_rx);
@@ -570,11 +614,15 @@ int main()
 #endif
 
 #ifdef ADAT_RX
-        on stdcore[0] :
+        on stdcore[XUD_TILE] :
         {
             set_thread_fast_mode_on();
+
+#if(XUD_SERIES_SUPPORT == XUD_L_SERIES)
+            /* Can't use REF clock on L-series as this is usb clock */
             set_port_clock(p_adat_rx, clk_adat_rx);
             start_clock(clk_adat_rx);
+#endif
             while (1)
             {
 				adatReceiver48000(p_adat_rx, c_adat_rx);
diff --git a/module_usb_audio/mixer/fastmix.S b/module_usb_audio/mixer/fastmix.S
index 0047a1d3..802c373c 100644
--- a/module_usb_audio/mixer/fastmix.S
+++ b/module_usb_audio/mixer/fastmix.S
@@ -4,6 +4,52 @@
 #define MIX_INPUTS 18
 
 
+#if defined(__XS2A__)
+
+#define DOMIX_TOP(i) \
+.cc_top doMix##i.function,doMix##i; \
+          .align    4 ;\
+.globl doMix##i ;\
+.type doMix##i, @function ;\
+.globl doMix##i##.nstackwords ;\
+.globl doMix##i##.maxthreads ; \
+.globl doMix##i##.maxtimers ; \
+.globl doMix##i##.maxchanends ; \
+.globl doMix##i##.maxsync ;\
+.linkset doMix##i##.locnoside, 1; \
+.linkset doMix##i##.locnochandec, 1;\
+.linkset doMix##i##.nstackwords, 0 ;\
+.linkset doMix##i##.maxchanends, 0 ;\
+.linkset doMix##i##.maxtimers, 0 ;\
+.linkset doMix##i##.maxthreads, 1; \
+doMix##i##: ;\
+          ENTSP_lu6 0; \
+          set       cp, r0; \
+          set       dp, r1; \
+          lsub      r0, r1, r0, r0, r0;\
+          .label_##i##:
+
+#define DOMIX_BOT(i) \
+          ldap      r11, _dp; \
+          set       dp, r11;\
+          ldap      r11, _cp;\
+          set       cp, r11;\
+\
+          mov       r0, r1;\
+          ldc       r2, 0x19;\
+          sext      r0, r2;\
+          eq        r0, r0, r1;\
+          bf        r0, .L20; \
+\
+          shl       r0, r1, 0x7;\
+          retsp     0x0;\
+\
+\
+.size doMix##i, .-doMix##i; \
+.cc_bottom doMix##i##.function;
+
+#else
+
 
 #define DOMIX_TOP(i) \
 .cc_top doMix##i.function,doMix##i; \
@@ -46,6 +92,8 @@ doMix##i##: ;\
 .size doMix##i, .-doMix##i; \
 .cc_bottom doMix##i##.function;
 
+#endif
+
 #define N MIX_INPUTS
 #define BODY(i) \
           ldw       r2,cp[i]; \
diff --git a/module_usb_audio/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc
index 88cb10e4..cffbb0f9 100644
--- a/module_usb_audio/mixer/mixer.xc
+++ b/module_usb_audio/mixer/mixer.xc
@@ -201,9 +201,8 @@ static inline void GiveSamplesToHost(chanend c, xc_ptr ptr, xc_ptr multIn)
 }
 
 #pragma unsafe arrays
-static inline void GetSamplesFromHost(chanend c, unsigned underflow)
+static inline void GetSamplesFromHost(chanend c)
 {
-    if(!underflow)
     {
 #pragma loop unroll
         for (int i=0; i<NUM_USB_CHAN_OUT; i++)
@@ -245,11 +244,8 @@ static inline void GetSamplesFromHost(chanend c, unsigned underflow)
 }
 
 #pragma unsafe arrays
-static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut, unsigned underflow)
+static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut)
 {
-    outuint(c, underflow);
-
-    if(!underflow)
     {
 #pragma loop unroll
         for (int i=0; i<NUM_USB_CHAN_OUT; i++)
@@ -354,20 +350,16 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
     int mixed;
 #endif
     unsigned cmd;
-
-    unsigned underflow = 1;
+    unsigned request = 0;
 
     while (1)
     {
 #pragma xta endpoint "mixer1_req"
-        /* Request from audio() */
-        inuint(c_mixer2);
+        /* Request from audio()/mixer2() */
+        request = inuint(c_mixer2);
 
-        GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut, underflow);
-        GetSamplesFromDevice(c_mixer2);
-
-        /* Request data from decouple thread */
-        outuint(c_host, 0);
+        /* Forward on Request for data to decouple thread */
+        outuint(c_host, request);
 
         /* Between request to decouple and respose ~ 400nS latency for interrupt to fire */
         select
@@ -504,9 +496,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
                     sampFreq = inuint(c_host);
                     mixer1_mix2_flag = sampFreq > 96000;
 
-                    /* Wait for request */
-                    inuint(c_mixer2);
-
                     /* Inform mixer2 (or audio()) about freq change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, sampFreq);
@@ -515,9 +504,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
                 case SET_STREAM_FORMAT_OUT:
                 case SET_STREAM_FORMAT_IN:
 
-                     /* Wait for request */
-                    inuint(c_mixer2);
-
                     /* Inform mixer2 (or audio()) about format change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, inuint(c_host));
@@ -545,14 +531,14 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
         }
         else
         {
-            underflow = inuint(c_host);
+            inuint(c_host);
 #if MAX_MIX_COUNT > 0
-            outuint(c_mixer2, underflow);
+            outuint(c_mixer2, 0);
             GiveSamplesToHost(c_host, samples_to_host_map, multIn);
 
             outuint(c_mixer2, 0);
             inuint(c_mixer2);
-            GetSamplesFromHost(c_host, underflow);
+            GetSamplesFromHost(c_host);
             outuint(c_mixer2, 0);
             inuint(c_mixer2);
 #ifdef FAST_MIXER
@@ -588,7 +574,7 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #ifdef FAST_MIXER
                 mixed = doMix4(samples, mix_mult_slice(4));
 #else
-                mixed = doMix(samples_array,mix_map_slice(4),mix_mult_slice(4));
+                mixed = doMix(samples, mix_map_slice(4),mix_mult_slice(4));
 #endif
                 write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 4), mixed);
 
@@ -601,9 +587,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #ifdef FAST_MIXER
                 mixed = doMix6(samples, mix_mult_slice(6));
 #else
-                mixed = doMix(samples_array,mix_map_slice(6),mix_mult_slice(6));
+                mixed = doMix(samples, mix_map_slice(6),mix_mult_slice(6));
 #endif
-                write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 6), mixed);
+                write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 6), mixed);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
                 ComputeMixerLevel(mixed, 6);
@@ -612,9 +598,10 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
             }
 #else       /* IF MAX_MIX_COUNT > 0 */
             /* No mixes, this thread runs on its own doing just volume */
-
+            GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut);
+            GetSamplesFromDevice(c_mixer2);
             GiveSamplesToHost(c_host, samples_to_host_map, multIn);
-            GetSamplesFromHost(c_host, underflow);
+            GetSamplesFromHost(c_host);
 #endif
         }
     }
@@ -627,13 +614,16 @@ static int mixer2_mix2_flag = (DEFAULT_FREQ > 96000);
 static void mixer2(chanend c_mixer1, chanend c_audio)
 {
     int mixed;
-    unsigned underflow = 0;
+    unsigned request;
 
     while (1)
     {
-        outuint(c_mixer1, 0);
 #pragma xta endpoint "mixer2_req"
-        inuint(c_audio);
+        request = inuint(c_audio);
+
+        /* Forward the request on */
+        outuint(c_mixer1, request);
+
         if(testct(c_mixer1))
         {
             int sampFreq;
@@ -678,8 +668,8 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
         }
         else
         {
-            underflow = inuint(c_mixer1);
-            GiveSamplesToDevice(c_audio, samples_to_device_map, multOut, underflow);
+            (void) inuint(c_mixer1);
+            GiveSamplesToDevice(c_audio, samples_to_device_map, multOut);
             inuint(c_mixer1);
             outuint(c_mixer1, 0);
             GetSamplesFromDevice(c_audio);
@@ -689,7 +679,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
       mixed = doMix1(samples, mix_mult_slice(1));
 #else
-      mixed = doMix(samples_array,mix_map_slice(1),mix_mult_slice(1));
+      mixed = doMix(samples, mix_map_slice(1),mix_mult_slice(1));
 #endif
 
       write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 1), mixed);
@@ -709,7 +699,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
         mixed = doMix3(samples, mix_mult_slice(3));
 #else
-        mixed = doMix(samples_array,mix_map_slice(3),mix_mult_slice(3));
+        mixed = doMix(samples, mix_map_slice(3),mix_mult_slice(3));
 #endif
 
         write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 3), mixed);
@@ -723,7 +713,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
     mixed = doMix5(samples, mix_mult_slice(5));
 #else
-    mixed = doMix(samples_array,mix_map_slice(5),mix_mult_slice(5));
+    mixed = doMix(samples, mix_map_slice(5),mix_mult_slice(5));
 #endif
     write_via_xc_ptr_indexed(samples, NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 5, mixed);
 
@@ -736,7 +726,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
     mixed = doMix7(samples, mix_mult_slice(7));
 #else
-    mixed = doMix(samples_array,mix_map_slice(7),mix_mult_slice(7));
+    mixed = doMix(samples, mix_map_slice(7),mix_mult_slice(7));
 #endif
 
     write_via_xc_ptr_indexed(samples,  NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 7, mixed);
diff --git a/module_usb_audio/reboot.xc b/module_usb_audio/reboot.xc
index 56eb9af0..7213db6d 100644
--- a/module_usb_audio/reboot.xc
+++ b/module_usb_audio/reboot.xc
@@ -6,6 +6,12 @@
 
 #define XS1_SU_PERIPH_USB_ID 0x1
 
+#if (XUD_SERIES_SUPPORT == XUD_X200_SERIES)
+#define PLL_MASK 0x7FFFFFFF
+#else
+#define PLL_MASK 0xFFFFFFFF
+#endif
+
 /* Note, this function is prototyped in xs1.h only from 13 tools onwards */
 unsigned get_tile_id(tileref);
 
@@ -40,25 +46,29 @@ void device_reboot_aux(void)
         if(localTileId != tileId)
         {
             read_sswitch_reg(tileId, 6, pllVal);
+            pllVal &= PLL_MASK;
             write_sswitch_reg_no_ack(tileId, 6, pllVal);
         }
     }
 
     /* Finally reboot this tile! */
     read_sswitch_reg(localTileId, 6, pllVal);
+    pllVal &= PLL_MASK;
     write_sswitch_reg_no_ack(localTileId, 6, pllVal);
 #endif
 }
 
 /* Reboots XMOS device by writing to the PLL config register */
-void device_reboot_implementation(chanend spare)
+void device_reboot(chanend spare)
 {
 #if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
-    outct(spare, XS1_CT_END);   // have to do this before freeing the chanend
-    inct(spare);                // Receive end ct from usb_buffer to close down in both directions
+    //outct(spare, XS1_CT_END);   // have to do this before freeing the chanend
+    //inct(spare);                // Receive end ct from usb_buffer to close down in both directions
 
     /* Need a spare chanend so we can talk to the pll register */
-    asm("freer res[%0]"::"r"(spare));
+    //asm("freer res[%0]"::"r"(spare));
 #endif
     device_reboot_aux();
+
+    while(1);
 }
diff --git a/module_usb_audio/rebootwrapper.s b/module_usb_audio/rebootwrapper.s
deleted file mode 100644
index ae321d2a..00000000
--- a/module_usb_audio/rebootwrapper.s
+++ /dev/null
@@ -1,36 +0,0 @@
-# Wrapper generated from this xc code
-# Then modified to fix maxchanends to 0
-# Then simplified
-#void device_reboot_implementation(chanend spare);
-#
-#// This version just exists so generate an assembly wrapper function for me.
-#void device_reboot(chanend spare) 
-#{
-#    device_reboot_implementation(spare);
-#}
-
-.extern device_reboot_implementation, "f{0}(chd)"
-          .text
-          .align    2
-.cc_top device_reboot.function,device_reboot
-          .align    4
-.call device_reboot, device_reboot_implementation
-.globl device_reboot, "f{0}(chd)"
-.globl device_reboot.nstackwords
-.globl device_reboot.maxthreads
-.globl device_reboot.maxtimers
-.globl device_reboot.maxchanends
-.globl device_reboot.maxsync
-.type  device_reboot, @function
-.linkset device_reboot.locnoside, 1
-.linkset device_reboot.locnochandec, 1
-.linkset device_reboot.nstackwords, device_reboot_implementation.nstackwords + 1
-device_reboot:
-          entsp     0x1 
-          bl        device_reboot_implementation 
-          retsp     0x1 
-.size device_reboot, .-device_reboot
-.cc_bottom device_reboot.function
-.linkset device_reboot.maxchanends, 0#device_reboot_implementation.maxchanends
-.linkset device_reboot.maxtimers, device_reboot_implementation.maxtimers
-.linkset device_reboot.maxthreads, device_reboot_implementation.maxthreads
diff --git a/module_usb_audio/uac_hwresources.h b/module_usb_audio/uac_hwresources.h
new file mode 100644
index 00000000..13d1da2a
--- /dev/null
+++ b/module_usb_audio/uac_hwresources.h
@@ -0,0 +1,45 @@
+
+#ifndef _UAC_HWRESOURCES_H_
+#define _UAC_HWRESOURCES_H_
+
+#include "xud.h"                 /* XMOS USB Device Layer defines and functions */
+
+#if ((XUD_SERIES_SUPPORT != XUD_U_SERIES) && (XUD_SERIES_SUPPORT != XUD_X200_SERIES))
+
+/* XUD_L_SERIES and XUD_G_SERIES */
+
+#if (AUDIO_IO_TILE == XUD_TILE)
+/* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI
+ * if MIDI and XUD on same tile. See XUD documentation.
+ *
+ * This is a clash with S/PDIF Tx but simultaneous S/PDIF and MIDI not currently supported on single tile device
+ *
+ */
+#define CLKBLK_MIDI        XS1_CLKBLK_1;
+#else
+#define CLKBLK_MIDI        XS1_CLKBLK_REF;
+#endif
+
+#define CLKBLK_SPDIF_TX    XS1_CLKBLK_1
+#define CLKBLK_SPDIF_RX    XS1_CLKBLK_1
+#define CLKBLK_MCLK        XS1_CLKBLK_2 /* Note, potentially used twice */
+#define CLKBLK_ADAT_RX     XS1_CLKBLK_3
+#define CLKBLK_USB_RST     XS1_CLKBLK_4 /* Clock block passed into L/G series XUD */
+#define CLKBLK_FLASHLIB    XS1_CLKBLK_5 /* Clock block for use by flash lib */
+
+#define CLKBLK_I2S_BIT     XS1_CLKBLK_3
+
+#else
+
+/* XUD_U_SERIES, XUD_X200_SERIES */
+/* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */
+#define CLKBLK_MIDI        XS1_CLKBLK_REF;
+#define CLKBLK_SPDIF_TX    XS1_CLKBLK_1
+#define CLKBLK_SPDIF_RX    XS1_CLKBLK_1
+#define CLKBLK_MCLK        XS1_CLKBLK_2   /* Note, potentially used twice */
+#define CLKBLK_FLASHLIB    XS1_CLKBLK_3   /* Clock block for use by flash lib */
+#define CLKBLK_ADAT_RX     XS1_CLKBLK_REF /* Use REF for ADAT_RX on U/x200 series */
+#define CLKBLK_I2S_BIT     XS1_CLKBLK_3
+#endif
+
+#endif /* _UAC_HWRESOURCES_H_ */
diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
index edb985e0..89a8844e 100644
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -129,10 +129,9 @@ void handle_audio_request(chanend c_mix_out)
     int space_left;
 
     /* Input word that triggered interrupt and handshake back */
-    (void) inuint(c_mix_out);
+    unsigned underflowSample = inuint(c_mix_out);
 
-    /* Reply with underflow */
-    outuint(c_mix_out, outUnderflow);
+    outuint(c_mix_out, 0);
 
     /* If in overflow condition then receive samples and throw away */
     if(inOverflow || sampsToWrite == 0)
@@ -176,7 +175,7 @@ __builtin_unreachable();
                     int mult;
                     int h;
                     unsigned l;
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     sample = h << 3;
 
@@ -207,7 +206,7 @@ __builtin_unreachable();
                     int mult;
                     int h;
                     unsigned l;
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     sample = h << 3;
 #if (STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED == 1)
@@ -240,7 +239,7 @@ __builtin_unreachable();
                     int mult;
                     int h;
                     unsigned l;
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multIn),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     sample = h << 3;
 #endif
@@ -290,21 +289,11 @@ __builtin_unreachable();
     if(outUnderflow)
     {
 #pragma xta endpoint "out_underflow"
-#if 0
         /* We're still pre-buffering, send out 0 samps */
         for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
         {
-            unsigned sample;
-            unsigned mode;
-            GET_SHARED_GLOBAL(sample, g_muteSample);
-            GET_SHARED_GLOBAL(mode, dsdMode);
-
-            if(mode == DSD_MODE_DOP)
-                outuint(c_mix_out, 0xFA969600);
-            else
-            outuint(c_mix_out, sample);
+            outuint(c_mix_out, underflowSample);
         }
-#endif
 
         /* Calc how many samples left in buffer */
         outSamps = g_aud_from_host_wrptr - g_aud_from_host_rdptr;
@@ -343,7 +332,7 @@ __builtin_unreachable();
                     sample <<= 16;
 
 #if (OUTPUT_VOLUME_CONTROL == 1) && !defined(OUT_VOLUME_IN_MIXER)
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     /* Note, in 2 byte subslot mode - ignore lower result of macs */
                     h <<= 3;
@@ -371,7 +360,7 @@ __builtin_unreachable();
                     g_aud_from_host_rdptr+=4;
 
 #if (OUTPUT_VOLUME_CONTROL == 1) && !defined(OUT_VOLUME_IN_MIXER)
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     h <<= 3;
 #if (STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED == 1)
@@ -426,7 +415,7 @@ __builtin_unreachable();
                     unpackState++;
 
 #if (OUTPUT_VOLUME_CONTROL == 1) && !defined(OUT_VOLUME_IN_MIXER)
-                    asm("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
+                    asm volatile("ldw %0, %1[%2]":"=r"(mult):"r"(p_multOut),"r"(i));
                     {h, l} = macs(mult, sample, 0, 0);
                     h <<= 3;
                     outuint(c_mix_out, h);
@@ -476,7 +465,7 @@ __builtin_unreachable();
             }
 
             /* Get feedback val - ideally this would be syncronised */
-            asm("ldw   %0, dp[g_speed]" : "=r" (speed) :);
+            asm volatile("ldw   %0, dp[g_speed]" : "=r" (speed) :);
 
             /* Calc packet size to send back based on our fb */
             speedRem += speed;
@@ -587,10 +576,13 @@ static inline void SetupZerosSendBuffer(XUD_ep aud_to_host_usb_ep, unsigned samp
 
     mid *= g_numUsbChan_In * slotSize;
 
-    asm("stw %0, %1[0]"::"r"(mid),"r"(g_aud_to_host_zeros));
+    asm volatile("stw %0, %1[0]"::"r"(mid),"r"(g_aud_to_host_zeros));
 
     /* Mark EP ready with the zero buffer. Note this will simply update the packet size
     * if it is already ready */
+    
+    /* g_aud_to_host_buffer is already set to g_aud_to_host_zeros */
+
     GET_SHARED_GLOBAL(p, g_aud_to_host_buffer);
 
     XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, mid);
@@ -648,18 +640,18 @@ void decouple(chanend c_mix_out
 #ifndef OUT_VOLUME_IN_MIXER
     for (int i = 0; i < NUM_USB_CHAN_OUT + 1; i++)
     {
-        asm("stw %0, %1[%2]"::"r"(MAX_VOL),"r"(p_multOut),"r"(i));
+        asm volatile("stw %0, %1[%2]"::"r"(MAX_VOL),"r"(p_multOut),"r"(i));
     }
 #endif
 
 #ifndef IN_VOLUME_IN_MIXER
     for (int i = 0; i < NUM_USB_CHAN_IN + 1; i++)
     {
-        asm("stw %0, %1[%2]"::"r"(MAX_VOL),"r"(p_multIn),"r"(i));
+        asm volatile("stw %0, %1[%2]"::"r"(MAX_VOL),"r"(p_multIn),"r"(i));
     }
 #endif
 
-    set_interrupt_handler(handle_audio_request, 200, 1, c_mix_out, 0);
+    set_interrupt_handler(handle_audio_request, 1, c_mix_out, 0);
 
     /* Wait for usb_buffer() to set up globals for us to use
      * Note: assumed that buffer_aud_ctl_chan is also setup before these globals are !0 */
@@ -729,7 +721,7 @@ void decouple(chanend c_mix_out
                 SET_SHARED_GLOBAL(totalSampsToWrite, 0);
 
                 /* Set buffer to send back to zeros buffer */
-                SET_SHARED_GLOBAL(g_aud_to_host_buffer,g_aud_to_host_zeros);
+                SET_SHARED_GLOBAL(g_aud_to_host_buffer, g_aud_to_host_zeros);
 
                 /* Update size of zeros buffer */
                 SetupZerosSendBuffer(aud_to_host_usb_ep, sampFreq, g_curSubSlot_In);
@@ -751,7 +743,7 @@ void decouple(chanend c_mix_out
                 chkct(c_mix_out, XS1_CT_END);
 
                 SET_SHARED_GLOBAL(g_freqChange, 0);
-                asm("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
+                asm volatile("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
 
                 ENABLE_INTERRUPTS();
 
@@ -795,7 +787,7 @@ void decouple(chanend c_mix_out
                 }
 
                 SET_SHARED_GLOBAL(g_freqChange, 0);
-                asm("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
+                asm volatile("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
 
                 ENABLE_INTERRUPTS();
             }
@@ -840,7 +832,7 @@ void decouple(chanend c_mix_out
 
                 /* Wait for handshake back */
                 chkct(c_mix_out, XS1_CT_END);
-                asm("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
+                asm volatile("outct res[%0],%1"::"r"(buffer_aud_ctl_chan),"r"(XS1_CT_END));
 
                 SET_SHARED_GLOBAL(g_freqChange, 0);
                 ENABLE_INTERRUPTS();
@@ -1000,7 +992,7 @@ void decouple(chanend c_mix_out
                 {
                     int p, len;
                     GET_SHARED_GLOBAL(p, g_aud_to_host_buffer);
-                    asm("ldw %0, %1[0]":"=r"(len):"r"(p));
+                    asm volatile("ldw %0, %1[0]":"=r"(len):"r"(p));
                     XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, len);
                 }
                 continue;
diff --git a/module_usb_audio/usb_buffer/decouple_interrupt.c b/module_usb_audio/usb_buffer/decouple_interrupt.c
new file mode 100644
index 00000000..ef3e78f1
--- /dev/null
+++ b/module_usb_audio/usb_buffer/decouple_interrupt.c
@@ -0,0 +1,3 @@
+#include <interrupt.h>
+
+register_interrupt_handler(handle_audio_request, 1, 200)
diff --git a/module_usb_audio/usb_buffer/interrupt.h b/module_usb_audio/usb_buffer/interrupt.h
index d52ee1b7..9a39d560 100644
--- a/module_usb_audio/usb_buffer/interrupt.h
+++ b/module_usb_audio/usb_buffer/interrupt.h
@@ -143,9 +143,19 @@
 
 //int ksp_enter, ksp_exit, r11_store;
 
+#ifdef __XS2A__
+#define ISSUE_MODE_SINGLE ".issue_mode single\n"
+#define ISSUE_MODE_DUAL ".issue_mode dual\n"
+#else
+#define ISSUE_MODE_SINGLE
+#define ISSUE_MODE_DUAL
+#endif
+
 #define do_interrupt_handler(f,args)    \
-  asm("bu .L__" #f "_handler_skip;\n" \
+  asm(ISSUE_MODE_SINGLE\
+      ".align 4\n" \
       "__" #f "_handler:\n"  \
+      "ENTSP_lu6 0\n" \
       "kentsp " #args " + 19\n" \
       "__kent:" \
       save_state(f,args)    \
@@ -154,19 +164,24 @@
       restore_state(f,args)       \
       "krestsp " #args " + 19 \n" \
       "__kret:\n" \
-      "kret\n" \
-      ".L__" #f "_handler_skip:\n");
+      "kret\n");
 
-#define set_interrupt_handler(f, nstackwords, args, c, ...) \
-  asm (" .section .dp.data,       \"adw\", @progbits\n" \
-       " .align 4\n" \
+#define register_interrupt_handler(f, args, nstackwords) \
+  asm (" .section .dp.data,       \"adw\", @progbits\n"  \
+       " .globl __" #f "_kernel_stack_end\n" \
+       " .globl __" #f "_handler\n" \
+       " .align 8\n"                                    \
        "__" #f "_kernel_stack:\n" \
        " .space  " #nstackwords ", 0\n" \
-       " .text\n"); \
-  asm("mov r10, %0; ldaw r11, dp[__" #f "_kernel_stack];add r11, r11, r10;ldaw r10, sp[0]; "\
-      "set sp,r11;stw r10, sp[0]; krestsp 0"::"r"(nstackwords-8):"r10","r11"); \
+       "__" #f "_kernel_stack_end:\n" \
+       " .space 2\n"\
+       " .text\n");                             \
+      do_interrupt_handler(f, args)
+
+#define set_interrupt_handler(f, args, c, ...) \
+  asm("ldaw r11, dp[__" #f "_kernel_stack_end];ldaw r10, sp[0]; " \
+      "set sp,r11;stw r10, sp[0]; krestsp 0":::"r10","r11");      \
   store_args ## args(c, __VA_ARGS__) \
-  do_interrupt_handler(f, args) \
   asm("ldap r11, __" #f "_handler; setv res[%0],r11"::"r"(c):"r11");    \
   asm("setc res[%0], 0xa; eeu res[%0]"::"r"(c));                        \
   asm("setsr (((0) & ~(((1 << 0x1) - 1) << 0x1)) | (((1) << 0x1) & (((1 << 0x1) - 1) << 0x1)))");
diff --git a/module_usb_audio/usb_buffer/usb_buffer.h b/module_usb_audio/usb_buffer/usb_buffer.h
index 038bbdbc..dabdbbd1 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.h
+++ b/module_usb_audio/usb_buffer/usb_buffer.h
@@ -17,6 +17,8 @@
  *  \param c_aud_ctl Audio control channel connected to  Endpoint0()
  *  \param p_off_mclk A port that is clocked of the MCLK input (not the MCLK input itself)
  */
+#include "devicedefines.h"
+
 void buffer(chanend c_aud_out,
             chanend c_aud_in,
 #if (NUM_USB_CHAN_IN == 0) || defined (UAC_FORCE_FEEDBACK_EP)
diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
index 2201b1fc..a42fe37f 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -317,6 +317,10 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
                             sofCount = 0;
                             clocks = 0;
                             remnant = 0;
+                            int min, mid, max;
+                            GetADCCounts(sampleFreq, min, mid, max);
+                            g_speed = mid<<16;
+                            
 
                         }
                         /* Ideally we want to wait for handshake (and pass back up) here.  But we cannot keep this
@@ -384,7 +388,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
                  * lastClock being incorrect */
 
                 /* Get MCLK count */
-                asm (" getts %0, res[%1]" : "=r" (u_tmp) : "r" (p_off_mclk));
+                asm volatile(" getts %0, res[%1]" : "=r" (u_tmp) : "r" (p_off_mclk));
 
                 GET_SHARED_GLOBAL(freqChange, g_freqChange);
                 if(freqChange == SET_SAMPLE_FREQ)
@@ -428,7 +432,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
 #endif
                         {
                             int usb_speed;
-                            asm("stw %0, dp[g_speed]"::"r"(clocks));   // g_speed = clocks
+                            asm volatile("stw %0, dp[g_speed]"::"r"(clocks));   // g_speed = clocks
 
                             GET_SHARED_GLOBAL(usb_speed, g_curUsbSpeed);
 
diff --git a/module_usb_audio/user_hid.h b/module_usb_audio/user_hid.h
index e834aa04..dd0b355e 100644
--- a/module_usb_audio/user_hid.h
+++ b/module_usb_audio/user_hid.h
@@ -1,3 +1,12 @@
 
+
+/* These defines relate to the HID report desc - do not mod */
+#define HID_CONTROL_PLAYPAUSE_SHIFT    0x01
+#define HID_CONTROL_NEXT_SHIFT 		   0x02
+#define HID_CONTROL_PREV_SHIFT		   0x03
+#define HID_CONTROL_VOLUP_SHIFT        0x04
+#define HID_CONTROL_VOLDN_SHIFT		   0x05
+#define HID_CONTROL_MUTE_SHIFT		   0x06
+
 void UserReadHIDButtons(unsigned char hidData[]);
 
diff --git a/module_usb_audio_adat/.cproject b/module_usb_audio_adat/.cproject
deleted file mode 100644
index 252164f5..00000000
--- a/module_usb_audio_adat/.cproject
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<?fileVersion 4.0.0?>
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-    <storageModule moduleId="org.eclipse.cdt.core.settings">
-              
-        <cconfiguration id="com.xmos.cdt.toolchain.88274778">
-            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.xmos.cdt.toolchain.88274778" moduleId="org.eclipse.cdt.core.settings" name="Default">
-                <externalSettings />
-                <extensions>
-                    <extension id="com.xmos.cdt.core.XEBinaryParser" point="org.eclipse.cdt.core.BinaryParser" />
-                    <extension id="com.xmos.cdt.core.XdeErrorParser" point="org.eclipse.cdt.core.ErrorParser" />
-                    <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser" />
-                </extensions>
-            </storageModule>
-            <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-                <buildTargets>
-                    <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                        <buildCommand>xmake</buildCommand>
-                        <buildArguments> -f .makefile</buildArguments>
-                        <buildTarget>all</buildTarget>
-                        <stopOnError>true</stopOnError>
-                        <useDefaultCommand>true</useDefaultCommand>
-                        <runAllBuilders>true</runAllBuilders>
-                    </target>
-                    <target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-                        <buildCommand>xmake</buildCommand>
-                        <buildArguments> -f .makefile</buildArguments>
-                        <buildTarget>clean</buildTarget>
-                        <stopOnError>true</stopOnError>
-                        <useDefaultCommand>true</useDefaultCommand>
-                        <runAllBuilders>true</runAllBuilders>
-                    </target>
-                </buildTargets>
-            </storageModule>
-            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                <configuration buildProperties="" description="" id="com.xmos.cdt.toolchain.88274778" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-                    <folderInfo id="com.xmos.cdt.toolchain.88274778.1127281840" name="/" resourcePath="">
-                        <toolChain id = "com.xmos.cdt.toolchain.47341607" name="com.xmos.cdt.toolchain" superClass="com.xmos.cdt.toolchain">
-                            <targetPlatform archList="all" binaryParser="com.xmos.cdt.core.XEBinaryParser" id = "com.xmos.cdt.core.platform.90164448" isAbstract="false" osList="linux,win32,macosx" superClass="com.xmos.cdt.core.platform" />
-                            <builder arguments=" -f .makefile" id = "com.xmos.cdt.builder.base.76809194" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="com.xmos.cdt.builder.base">
-                                <outputEntries>
-                                    <entry flags="VALUE_WORKSPACE_PATH" kind="outputPath" name="bin" />
-                                </outputEntries>
-                            </builder>
-                            <tool id = "com.xmos.cdt.xc.compiler.49455840" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.81996622" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
-                                    <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
-                                    <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
-                                    <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
-                                    <listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
-                                    <listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
-                                    <listOptionValue builtIn="false" value="XCC_VERSION_YEAR=11"/>
-                                    <listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
-                                    <listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1111"/>
-                                    <listOptionValue builtIn="false" value="XCC_VERSION_MINOR=1"/>
-                                    <listOptionValue builtIn="false" value="XCC_VERSION_MONTH=11"/>
-                                    <listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
-                                    <listOptionValue builtIn="false" value="__MCPP=2"/>
-                                    <listOptionValue builtIn="false" value="__XC__=1"/>
-                                    <listOptionValue builtIn="false" value="__XS1B__=1"/>
-                                    <listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
-                                    <listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
-                                    <listOptionValue builtIn="false" value="__STDC__=1"/>
-                                    <listOptionValue builtIn="false" value="__GNUC__=4"/>
-                                    <listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
-                                    <listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
-                                    <listOptionValue builtIn="false" value="__llvm__=1"/>
-                                    <listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
-                                    <listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
-                                    <listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
-                                    <listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
-                                    <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
-                                    <listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
-                                    <listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
-                                    <listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
-                                    <listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
-                                    <listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
-                                    <listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
-                                    <listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
-                                    <listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
-                                    <listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
-                                    <listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
-                                    <listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
-                                    <listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
-                                    <listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
-                                    <listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
-                                    <listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
-                                    <listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
-                                    <listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
-                                    <listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
-                                    <listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
-                                    <listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
-                                    <listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
-                                    <listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
-                                    <listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
-                                    <listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
-                                    <listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
-                                    <listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
-                                    <listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
-                                    <listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
-                                    <listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
-                                    <listOptionValue builtIn="false" value="__BLOCKS__=1"/>
-                                    <listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
-                                    <listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
-                                    <listOptionValue builtIn="false" value="__ELF__=1"/>
-                                    <listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
-                                    <listOptionValue builtIn="false" value="__cplusplus=1"/>
-                                    <listOptionValue builtIn="false" value="__GNUG__=4"/>
-                                    <listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
-                                    <listOptionValue builtIn="false" value="__DEPRECATED=1"/>
-                                    <listOptionValue builtIn="false" value="__EXCEPTIONS=1"/>
-                                    <listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
-                                </option>
-								<option id = "com.xmos.xc.compiler.option.include.paths.38879463" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
-
-								</option>
-								<inputType id = "com.xmos.cdt.xc.compiler.input.71179776" name="XC" superClass="com.xmos.cdt.xc.compiler.input"/>
-                            </tool>
-							<tool id = "com.xmos.cdt.c.compiler.57348975" name="com.xmos.cdt.c.compiler" superClass="com.xmos.cdt.c.compiler">
-								<option id = "com.xmos.c.compiler.option.defined.symbols.99056737" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__STDC__=1"/>
-									<listOptionValue builtIn="false" value="__STDC_VERSION__=199901L"/>
-									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
-									<listOptionValue builtIn="false" value="__GNUC__=4"/>
-									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
-									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
-									<listOptionValue builtIn="false" value="__llvm__=1"/>
-									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
-									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
-									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
-									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
-									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
-									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
-									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
-									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
-									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
-									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
-									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
-									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
-									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
-									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
-									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
-									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
-									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
-									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
-									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
-									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
-									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
-									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
-									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
-									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
-									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
-									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
-									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
-									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
-									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
-									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
-									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
-									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
-									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
-									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
-									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
-									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
-									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
-									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
-									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
-									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
-									<listOptionValue builtIn="false" value="__GNUC_STDC_INLINE__=1"/>
-									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
-									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
-									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
-									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
-									<listOptionValue builtIn="false" value="__XS1B__=1"/>
-									<listOptionValue builtIn="false" value="__ELF__=1"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=12"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=2"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1202"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=0"/>
-									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
-								</option>
-								<option id = "com.xmos.c.compiler.option.include.paths.41424664" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
-
-								</option>
-								<inputType id = "com.xmos.cdt.c.compiler.input.c.12161256" name="C" superClass="com.xmos.cdt.c.compiler.input.c"/>
-							</tool>
-							<tool id = "com.xmos.cdt.cxx.compiler.90016111" name="com.xmos.cdt.cxx.compiler" superClass="com.xmos.cdt.cxx.compiler">
-								<option id = "com.xmos.cxx.compiler.option.defined.symbols.49996190" name="com.xmos.cxx.compiler.option.defined.symbols" superClass="com.xmos.cxx.compiler.option.defined.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__STDC__=1"/>
-									<listOptionValue builtIn="false" value="__cplusplus=1"/>
-									<listOptionValue builtIn="false" value="__STDC_HOSTED__=1"/>
-									<listOptionValue builtIn="false" value="__GNUC__=4"/>
-									<listOptionValue builtIn="false" value="__GNUG__=4"/>
-									<listOptionValue builtIn="false" value="__GNUC_MINOR__=2"/>
-									<listOptionValue builtIn="false" value="__GNUC_PATCHLEVEL__=1"/>
-									<listOptionValue builtIn="false" value="__llvm__=1"/>
-									<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__PTRDIFF_TYPE__=int"/>
-									<listOptionValue builtIn="false" value="__WCHAR_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__WINT_TYPE__=unsigned"/>
-									<listOptionValue builtIn="false" value="__INTMAX_TYPE__=long"/>
-									<listOptionValue builtIn="false" value="__UINTMAX_TYPE__=long"/>
-									<listOptionValue builtIn="false" value="__GXX_WEAK__=1"/>
-									<listOptionValue builtIn="false" value="__DEPRECATED=1"/>
-									<listOptionValue builtIn="false" value="__GXX_ABI_VERSION=1002"/>
-									<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
-									<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
-									<listOptionValue builtIn="false" value="__INT_MAX__=2147483647"/>
-									<listOptionValue builtIn="false" value="__LONG_MAX__=2147483647L"/>
-									<listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
-									<listOptionValue builtIn="false" value="__WCHAR_MAX__=255U"/>
-									<listOptionValue builtIn="false" value="__CHAR_BIT__=8"/>
-									<listOptionValue builtIn="false" value="__INTMAX_MAX__=9223372036854775807LL"/>
-									<listOptionValue builtIn="false" value="__FLT_EVAL_METHOD__=0"/>
-									<listOptionValue builtIn="false" value="__DEC_EVAL_METHOD__=2"/>
-									<listOptionValue builtIn="false" value="__FLT_RADIX__=2"/>
-									<listOptionValue builtIn="false" value="__FLT_MANT_DIG__=24"/>
-									<listOptionValue builtIn="false" value="__FLT_DIG__=6"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN_EXP__=(-125)"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN_10_EXP__=(-37)"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX_EXP__=128"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX_10_EXP__=38"/>
-									<listOptionValue builtIn="false" value="__FLT_MAX__=3.40282347e+38F"/>
-									<listOptionValue builtIn="false" value="__FLT_MIN__=1.17549435e-38F"/>
-									<listOptionValue builtIn="false" value="__FLT_EPSILON__=1.19209290e-7F"/>
-									<listOptionValue builtIn="false" value="__FLT_DENORM_MIN__=1.40129846e-45F"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__FLT_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_MANT_DIG__=53"/>
-									<listOptionValue builtIn="false" value="__DBL_DIG__=15"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN_EXP__=(-1021)"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN_10_EXP__=(-307)"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX_EXP__=1024"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX_10_EXP__=308"/>
-									<listOptionValue builtIn="false" value="__DBL_MAX__=1.7976931348623157e+308"/>
-									<listOptionValue builtIn="false" value="__DBL_MIN__=2.2250738585072014e-308"/>
-									<listOptionValue builtIn="false" value="__DBL_EPSILON__=2.2204460492503131e-16"/>
-									<listOptionValue builtIn="false" value="__DBL_DENORM_MIN__=4.9406564584124654e-324"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__DBL_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_MANT_DIG__=53"/>
-									<listOptionValue builtIn="false" value="__LDBL_DIG__=15"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN_EXP__=(-1021)"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN_10_EXP__=(-307)"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX_EXP__=1024"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX_10_EXP__=308"/>
-									<listOptionValue builtIn="false" value="__DECIMAL_DIG__=17"/>
-									<listOptionValue builtIn="false" value="__LDBL_MAX__=1.7976931348623157e+308L"/>
-									<listOptionValue builtIn="false" value="__LDBL_MIN__=2.2250738585072014e-308L"/>
-									<listOptionValue builtIn="false" value="__LDBL_EPSILON__=2.2204460492503131e-16L"/>
-									<listOptionValue builtIn="false" value="__LDBL_DENORM_MIN__=4.9406564584124654e-324L"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_DENORM__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_INFINITY__=1"/>
-									<listOptionValue builtIn="false" value="__LDBL_HAS_QUIET_NAN__=1"/>
-									<listOptionValue builtIn="false" value="__DEC32_MANT_DIG__=7"/>
-									<listOptionValue builtIn="false" value="__DEC32_MIN_EXP__=(-95)"/>
-									<listOptionValue builtIn="false" value="__DEC32_MAX_EXP__=96"/>
-									<listOptionValue builtIn="false" value="__DEC32_MIN__=1E-95DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_MAX__=9.999999E96DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_EPSILON__=1E-6DF"/>
-									<listOptionValue builtIn="false" value="__DEC32_DEN__=0.000001E-95DF"/>
-									<listOptionValue builtIn="false" value="__DEC64_MANT_DIG__=16"/>
-									<listOptionValue builtIn="false" value="__DEC64_MIN_EXP__=(-383)"/>
-									<listOptionValue builtIn="false" value="__DEC64_MAX_EXP__=384"/>
-									<listOptionValue builtIn="false" value="__DEC64_MIN__=1E-383DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_MAX__=9.999999999999999E384DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_EPSILON__=1E-15DD"/>
-									<listOptionValue builtIn="false" value="__DEC64_DEN__=0.000000000000001E-383DD"/>
-									<listOptionValue builtIn="false" value="__DEC128_MANT_DIG__=34"/>
-									<listOptionValue builtIn="false" value="__DEC128_MIN_EXP__=(-6143)"/>
-									<listOptionValue builtIn="false" value="__DEC128_MAX_EXP__=6144"/>
-									<listOptionValue builtIn="false" value="__DEC128_MIN__=1E-6143DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_MAX__=9.999999999999999999999999999999999E6144DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_EPSILON__=1E-33DL"/>
-									<listOptionValue builtIn="false" value="__DEC128_DEN__=0.000000000000000000000000000000001E-6143DL"/>
-									<listOptionValue builtIn="false" value="__REGISTER_PREFIX__"/>
-									<listOptionValue builtIn="false" value="__USER_LABEL_PREFIX__"/>
-									<listOptionValue builtIn="false" value="__VERSION__=&quot;4.2.1"/>
-									<listOptionValue builtIn="false" value="__GNUC_GNU_INLINE__=1"/>
-									<listOptionValue builtIn="false" value="__BLOCKS__=1"/>
-									<listOptionValue builtIn="false" value="__NO_INLINE__=1"/>
-									<listOptionValue builtIn="false" value="__FINITE_MATH_ONLY__=0"/>
-									<listOptionValue builtIn="false" value="__CHAR_UNSIGNED__=1"/>
-									<listOptionValue builtIn="false" value="__WCHAR_UNSIGNED__=1"/>
-									<listOptionValue builtIn="false" value="__XS1B__=1"/>
-									<listOptionValue builtIn="false" value="__ELF__=1"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_YEAR=12"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MONTH=2"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MAJOR=1202"/>
-									<listOptionValue builtIn="false" value="XCC_VERSION_MINOR=0"/>
-									<listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
-								</option>
-								<option id = "com.xmos.cxx.compiler.option.include.paths.71736894" name="com.xmos.cxx.compiler.option.include.paths" superClass="com.xmos.cxx.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
-
-								</option>
-								<inputType id = "com.xmos.cdt.cxx.compiler.input.cpp.69751" name="C++" superClass="com.xmos.cdt.cxx.compiler.input.cpp"/>
-							</tool>
-                        </toolChain>
-                    </folderInfo>
-                    <sourceEntries>
-                        <entry excluding=".build_*" flags="VALUE_WORKSPACE_PATH|RESOLVED"
-                    kind="sourcePath" name="" />
-                    </sourceEntries>
-                </configuration>
-            </storageModule>
-            <storageModule moduleId="scannerConfiguration">
-                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="" />
-                <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="makefileGenerator">
-                        <runAction arguments="-E -P -v -dD" command="" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments='-c &apos;gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;&apos;' command="sh" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments='-c &apos;g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;&apos;' command="sh" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-                <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-                    <buildOutputProvider>
-                        <openAction enabled="true" filePath="" />
-                        <parser enabled="true" />
-                    </buildOutputProvider>
-                    <scannerInfoProvider id="specsFile">
-                        <runAction arguments='-c &apos;gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;&apos;' command="sh" useDefault="true" />
-                        <parser enabled="true" />
-                    </scannerInfoProvider>
-                </profile>
-            </storageModule>
-            <storageModule moduleId="org.eclipse.cdt.core.externalSettings" />
-            <storageModule moduleId="org.eclipse.cdt.core.language.mapping" />
-            <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings" />
-        </cconfiguration>
-
-    </storageModule>
-    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id = "module_usb_audio_adat.null.87074855" name="module_usb_audio_adat" />
-    </storageModule>
-</cproject>
diff --git a/module_usb_audio_adat/.makefile b/module_usb_audio_adat/.makefile
deleted file mode 100644
index 87b347b9..00000000
--- a/module_usb_audio_adat/.makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all:
-	@echo "** Module only - only builds as part of application **"
-
-
-clean:
-	@echo "** Module only - only builds as part of application **"
-
-
diff --git a/module_usb_audio_adat/.project b/module_usb_audio_adat/.project
deleted file mode 100644
index 155a17c6..00000000
--- a/module_usb_audio_adat/.project
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>module_usb_audio_adat</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-            <triggers>clean,full,incremental,</triggers>
-            <arguments>
-                <dictionary>
-                    <key>?children?</key>
-                    <value>?name?=outputEntries\|?children?=?name?=entry\\\\|\\|\||</value>
-                </dictionary>
-                <dictionary>
-                    <key>?name?</key>
-                    <value></value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.append_environment</key>
-                    <value>true</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.buildArguments</key>
-                    <value>CONFIG=Debug</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.buildCommand</key>
-                    <value>xmake</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-                    <value>clean</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.contents</key>
-                    <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-                    <value>false</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-                    <value>true</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.enableFullBuild</key>
-                    <value>true</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.stopOnError</key>
-                    <value>true</value>
-                </dictionary>
-                <dictionary>
-                    <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-                    <value>false</value>
-                </dictionary>
-            </arguments>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-            <triggers>full,incremental,</triggers>
-            <arguments>
-            </arguments>
-        </buildCommand>
-    </buildSpec>
-    <natures>
-        <nature>org.eclipse.cdt.core.cnature</nature>
-        <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-        <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-        <nature>com.xmos.cdt.core.XdeProjectNature</nature>
-    </natures>
-</projectDescription>
-
diff --git a/module_usb_audio_adat/.xproject b/module_usb_audio_adat/.xproject
deleted file mode 100644
index d80aba33..00000000
--- a/module_usb_audio_adat/.xproject
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xproject><repository>sc_usb_audio</repository><partnum>XM-004720-SM</partnum></xproject>
\ No newline at end of file
diff --git a/module_usb_audio_adat/README.rst b/module_usb_audio_adat/README.rst
deleted file mode 100644
index a81d321d..00000000
--- a/module_usb_audio_adat/README.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-ADAT Module for UAC2 MC Reference Design
-========================================
-
-:scope: General Use
-:description: ADAT
-:keywords: ADAT
-:boards: XR-USB-AUDIO-20-MC
-
-ADAT code
diff --git a/module_usb_audio_adat/module_description b/module_usb_audio_adat/module_description
deleted file mode 100644
index e69de29b..00000000
diff --git a/module_usb_audio_adat/src/adatreceiver.h b/module_usb_audio_adat/src/adatreceiver.h
deleted file mode 100644
index 451f9df9..00000000
--- a/module_usb_audio_adat/src/adatreceiver.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/** ADAT Receive Thread (48kHz sample rate).
- *
- *  \param p ADAT port - should be 1-bit and clocked at 100MHz
- *  \param oChan channel on which decoded samples are output
- *
- *  The function will return if it cannot lock onto a 44,100/48,000 Hz
- *  signal. Normally the 48000 function is called in a while(1) loop. If
- *  both 44,100 and 48,000 need to be supported, they should be called in
- *  sequence in a while(1) loop. Note that the functions are large, and
- *  that 44,100 should not be called if it does not need to be supported.
- **/
-void adatReceiver48000(buffered in port:32 p, chanend oChan);
-
-/** ADAT Receive Thread (44.1kHz sample rate).
- *
- *  \param p ADAT port - should be 1-bit and clocked at 100MHz
- *  \param oChan channel on which decoded samples are output
- *
- *  The function will return if it cannot lock onto a 44,100/48,000 Hz
- *  signal. Normally the 48000 function is called in a while(1) loop. If
- *  both 44,100 and 48,000 need to be supported, they should be called in
- *  sequence in a while(1) loop. Note that the functions are large, and
- *  that 44,100 should not be called if it does not need to be supported.
- **/
-
-void adatReceiver44100(buffered in port:32 p, chanend oChan);
diff --git a/module_usb_audio_adat/src/adatreceiver.xc b/module_usb_audio_adat/src/adatreceiver.xc
deleted file mode 100644
index a2d19ff9..00000000
--- a/module_usb_audio_adat/src/adatreceiver.xc
+++ /dev/null
@@ -1,947 +0,0 @@
-// GENERATED CODE - DO NOT EDIT
-// Comments are in the generator
-#include <xs1.h>
-#include <stdio.h>
-#pragma unsafe arrays
-void adatReceiver48000(buffered in port:32 p, chanend oChan) {
-    const unsigned int mask = 0x80808080;
-    unsigned compressed;
-    unsigned nibble, word = 1, fourBits, data;
-    int old, violation;
-    unsigned int lookupCrcF[16] = {8, 9, 12, 13, 7, 6, 3, 2, 10, 11, 14, 15, 5, 4, 1, 0};
-    unsigned int lookupNRTZ[32] = {0, 8, 12, 4, 6, 14, 10, 2, 3, 11, 15, 7, 5, 13, 9, 1,
-                          1, 9, 13, 5, 7, 15, 11, 3, 2, 10, 14, 6, 4, 12, 8, 0};
-    for(int i =  0; i < 32; i++) { lookupNRTZ[i] <<= 4; }
-    do {
-        old = word; p :> word;
-    } while (word != old || (word != 0 && word+1 != 0));
-    while(1) {
-        violation = word;
-        p when pinsneq(violation) :> int _;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        outuint(oChan, nibble << 4 | 1);
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = old | compressed << 1;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        if (word != 0 && word+1 != 0) return;
-    }
-}
-
-// GENERATED CODE - DO NOT EDIT
-// Comments are in the generator
-#include <xs1.h>
-#include <stdio.h>
-#pragma unsafe arrays
-void adatReceiver44100(buffered in port:32 p, chanend oChan) {
-    const unsigned int mask = 0x80402010;
-    unsigned compressed;
-    unsigned nibble, word = 1, fourBits, data;
-    int old, violation;
-    unsigned int lookupCrcF[16] = {8, 12, 10, 14, 9, 13, 11, 15, 7, 3, 5, 1, 6, 2, 4, 0};
-    unsigned int lookupNRTZ[32] = {0, 8, 12, 4, 6, 14, 10, 2, 3, 11, 15, 7, 5, 13, 9, 1,
-                          1, 9, 13, 5, 7, 15, 11, 3, 2, 10, 14, 6, 4, 12, 8, 0};
-    for(int i =  0; i < 32; i++) { lookupNRTZ[i] <<= 4; }
-    do {
-        old = word; p :> word;
-    } while (word != old || (word != 0 && word+1 != 0));
-    while(1) {
-        violation = word;
-        p when pinsneq(violation) :> int _;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        outuint(oChan, nibble << 4 | 1);
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = old | compressed << 1;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = old | compressed << 1;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = old | compressed << 1;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 7) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 1) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = compressed;
-        p :> word;
-        fourBits = (word << 3) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = nibble << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        old = old | compressed << 1;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 6) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 3)) & 31];
-        old = compressed >> 2;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 4) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 1)) & 31];
-        old = compressed >> 4;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 0) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        old = compressed;
-        p :> word;
-        fourBits = (word << 5) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        compressed = compressed >> 1;
-        nibble = lookupNRTZ[(old | (compressed << 4)) & 31];
-        old = compressed >> 1;
-        data = (data | nibble) << 4;
-        p :> word;
-        fourBits = (word << 2) & mask;
-        crc32(fourBits, 0xf, 0xf);
-        compressed = lookupCrcF[fourBits];
-        nibble = lookupNRTZ[(old | (compressed << 2)) & 31];
-        old = compressed >> 3;
-        data = (data | nibble) << 4;
-        outuint(oChan, data);
-        p :> word;
-        if (word != 0 && word+1 != 0) return;
-    }
-}
-
diff --git a/module_usb_midi/.cproject b/module_usb_midi/.cproject
index 6e8bf901..fac2e099 100644
--- a/module_usb_midi/.cproject
+++ b/module_usb_midi/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.79700694" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.78264953" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.78264953" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/xpd.xml b/xpd.xml
index 25a5a992..4ed613a0 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -7,29 +7,25 @@
         </component>
         <component description = "queue" type = "demoCode" scope = "General Use" path = "module_queue" local = "false" id = "module_queue" name = "Queuing Module For USB Audio Framework">
             <board></board>
-            <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.5">module_xassert</componentDependency>
             <keyword>UAC2</keyword>
         </component>
         <component description = "Core USB Audio Module" type = "demoCode" scope = "General Use" path = "module_usb_audio" local = "false" id = "module_usb_audio" name = "USB AUDIO MODULE">
             <board>XR-USB-AUDIO-20-MC</board>
             <keyword>USB Audio UAC2</keyword>
         </component>
-        <component description = "ADAT" type = "demoCode" scope = "General Use" path = "module_usb_audio_adat" local = "false" id = "module_usb_audio_adat" name = "ADAT Module for UAC2 MC Reference Design">
-            <board>XR-USB-AUDIO-20-MC</board>
-            <keyword>ADAT</keyword>
-        </component>
         <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
             <board></board>
-            <componentDependency version = "6.11.0">module_queue</componentDependency>
-            <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
+            <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.5">module_xassert</componentDependency>
+            <componentDependency version = "6.12.4">module_queue</componentDependency>
             <keyword>MIDI</keyword>
         </component>
     </components>
     <dependency repo = "sc_util">
         <gitbranch>master</gitbranch>
-        <githash>f09fda14976cf969ae792e7c28b4e5a30e4c1eb9</githash>
+        <githash>7840b23c0f18f7701a13a6e030aefc0cdd62ade3</githash>
         <uri>git://github.com/xcore/sc_util</uri>
-        <version>1.0.4rc0</version>
+        <version>1.0.5rc0</version>
     </dependency>
     <description>USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.</description>
     <docdir>module_dfu/doc</docdir>
@@ -81,7 +77,28 @@
     <release parenthash = "30f610d185606bd17061581debb6693369fcbb05" version = "6.10.0alpha2" githash = "517fe9667c43f2c5fe0d8e5dae06be716342a16a"></release>
     <release parenthash = "38958db165ea44a8db74abd0cf294fcb466e5172" version = "6.11.0alpha0" githash = "af925d59b69833c0ec8d970b667b4164833e5d4c"></release>
     <release parenthash = "a4af4fd0f27b117df1f6e7ff6a10299f2ea91349" version = "6.11.0alpha1" githash = "bed9f5314a0f7f2c952da24bd6efa18931b12b93"></release>
-    <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2"></release>
+    <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release>
+    <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0" githash = "fa12263ac6248aa95abcdb11eaa5d6b09cffff7f"></release>
+    <release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1" githash = "3e61cee71c4aaa845908d5d9dfb9257a1000215d"></release>
+    <release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2" githash = "1e963e8bc5e02fc4a03cc1b4059533a7734417e9"></release>
+    <release parenthash = "575ee95714761eef35b2b59db4d09fe0bb311827" version = "6.11.2rc0" githash = "5bf4f147b1442ab7c682bb39cf9a159fe3770bf2"></release>
+    <release parenthash = "67b217f48f3e37fc9c185f126d0ce78e1892203d" version = "6.11.2rc1" githash = "46faa608ccdc0b44eb00425d2eb381cc8920504b"></release>
+    <release parenthash = "5eec2dd557d7d6c7e76643ad083879a24791e832" version = "6.11.2rc2" githash = "e1726efd172f52fe17e87687a59beeb0cc5dbd50"></release>
+    <release parenthash = "2f528c3e59378b6c9dc95ff5dbd73a6944b417ca" version = "6.11.3rc0" githash = "f4d02b8fd8ced64c28977ba38175cc5d633e4ddf"></release>
+    <release parenthash = "0c8cdd64a03f75d2c050ccadbb1bd8983534c7f7" version = "6.12.0alpha0" githash = "53c92345fc33bbdf6e8c2c42383755b4fb32350d"></release>
+    <release parenthash = "3087293667911378dda568b8d6ce05473780cf41" version = "6.12.0alpha1" githash = "e193478f759ec597725daa58df48d40b816f60b0"></release>
+    <release parenthash = "9be2eece00752df43d0d9ff3edf169407df30a72" version = "6.12.1alpha0" githash = "1d624b9a1f9cbbf262024abfc74c8dd8a0a16522"></release>
+    <release parenthash = "cdc2d74016f26492cf444a6f14ee82e104275874" version = "6.12.2rc0" githash = "e0e70d46060cabfc333ed08ccccb5dee565d1db2"></release>
+    <release parenthash = "53f819e748d25fdfd698303a48a7bfc51da77842" version = "6.12.2rc1" githash = "27e68d821d55560ac9d7b8878f2d77636864be1c"></release>
+    <release parenthash = "a09ba027a29767686091dfda3c390431cac8cdca" version = "6.12.2rc2" githash = "346f5a704f1130274b88cf742de73239e54b3c7d"></release>
+    <release parenthash = "cb6b3d3df25f5ee04577b9163f5ff2b7521919b3" version = "6.12.2rc3" githash = "d43c17a5c81724f880a001701669c5a00808a4e0"></release>
+    <release parenthash = "c385fc2e1506b63b2a2440855a3b9d2503c76fa7" version = "6.12.3rc0" githash = "0b2696742e992a8031eeedb5226c1570705eedb1"></release>
+    <release parenthash = "ee6fa86c6c20d12c1fac1db24c3c8136e69dd892" version = "6.12.3rc1" githash = "47db9e113163d14946cf7c6165687f1888f20806"></release>
+    <release parenthash = "4d61773cf3919dd973d149c1ad2fa78d8f0502fe" version = "6.12.3rc2" githash = "c42d93f6a7975e7065a4edb5b86ac07baedf33c1"></release>
+    <release parenthash = "2b8419d7fb9e95d87484ff96f6a4024b7fadbf85" version = "6.12.3rc3" githash = "85383c7463baada50b9ee80706508a58d5e511c5"></release>
+    <release parenthash = "381e480cbc7385d32a5f003517ce8608e653c270" version = "6.12.4rc0" githash = "31b6b1f7f41584707a0ed761f03b80c28669af10"></release>
+    <release parenthash = "f7af9f6132d619d7858ab16c728309f013f8472c" version = "6.12.4rc1" githash = "7f644a433a6ad3a2e323e4ae42ad0bfe7487090f"></release>
+    <release parenthash = "ace38607b0adc325167d1eddab8c425e721451f1" version = "6.12.5rc0"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>