From 9ed17c917b4cfe88a6e16de542ce800f355522fc Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 3 Dec 2013 15:18:50 +0000 Subject: [PATCH 1/2] NATIVE_DSD can now be set to 0 --- module_usb_audio/devicedefines.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index 48eb6795..351b52e5 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -29,10 +29,14 @@ #endif #endif -#if !defined (DSD_CHANS_DAC) -#define DSD_CHANS_DAC 0 -#else -#define NATIVE_DSD 1 /* Always enable Native DSD when DSD mode is enabled */ +#if defined(DSD_CHANS_DAC) + #if defined(NATIVE_DSD) && (NATIVE_DSD == 0) + #undef NATIVE_DSD + #else + #define NATIVE_DSD 1 /* Always enable Native DSD when DSD mode is enabled */ + #endif +#else + #define DSD_CHANS_DAC 0 #endif /* Max supported sample freq for device */ From f4620cd4639f845c9a2a7fa33eecc44fceeff516 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 4 Dec 2013 11:08:06 +0000 Subject: [PATCH 2/2] SpdifReceive.h include now guarded by SPDIF_RX define --- module_usb_audio/clocking/clockgen.xc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module_usb_audio/clocking/clockgen.xc b/module_usb_audio/clocking/clockgen.xc index 63628475..3da5ea1c 100644 --- a/module_usb_audio/clocking/clockgen.xc +++ b/module_usb_audio/clocking/clockgen.xc @@ -5,8 +5,10 @@ #include "devicedefines.h" #include "commands.h" -#include "SpdifReceive.h" +#if defined(SPDIF_RX) +#include "SpdifReceive.h" +#endif