From f32156da38e40f05dd8602c511754935974f53c5 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Mon, 23 Mar 2015 11:56:16 +0000
Subject: [PATCH] BCD_DEVICE guarded with ifndef

---
 CHANGELOG.rst                    | 2 ++
 module_usb_audio/devicedefines.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fdd2b1e8..b7f0c38b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,8 @@ sc_usb_audio Change Log
                   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
     - 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)
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index ce3f747d..b55f56f5 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -472,8 +472,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.