From e9586b59d3f50782ef028e24026329fa87f6dc99 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 17 May 2023 13:48:36 +0100 Subject: [PATCH] Move check for XUA_USB_EN after include of xua.h --- lib_xua/src/core/audiohub/audiohub_dsd.h | 2 +- lib_xua/src/core/xuduser/xuduser.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib_xua/src/core/audiohub/audiohub_dsd.h b/lib_xua/src/core/audiohub/audiohub_dsd.h index 4cfa8126..3986fec6 100644 --- a/lib_xua/src/core/audiohub/audiohub_dsd.h +++ b/lib_xua/src/core/audiohub/audiohub_dsd.h @@ -52,7 +52,7 @@ static inline void DoDsdDop(int &everyOther, unsigned samplesOut[], unsigned &ds /* When DSD is enabled and streaming is standard PCM, this function checks for a series of DoP markers in the upper byte. If found it will exit deliver() with the command to restart in DoP mode. When in DoP mode, this function will check for a single absence of the DoP marker and exit deliver() with the command - to restart in I2S mode. */ + to restart in I2S/PCM mode. */ static inline int DoDsdDopCheck(unsigned &dsdMode, int &dsdCount, unsigned curSamFreq, unsigned samplesOut[], unsigned &dsdMarker) { /* Check for DSD - note we only move into DoP mode if valid DoP Freq */ diff --git a/lib_xua/src/core/xuduser/xuduser.c b/lib_xua/src/core/xuduser/xuduser.c index 207906e7..c962e701 100644 --- a/lib_xua/src/core/xuduser/xuduser.c +++ b/lib_xua/src/core/xuduser/xuduser.c @@ -1,10 +1,12 @@ -// Copyright 2013-2021 XMOS LIMITED. +// Copyright 2013-2023 XMOS LIMITED. // This Software is subject to the terms of the XMOS Public Licence: Version 1. -#if XUA_USB_EN #include "xua.h" +#if XUA_USB_EN #include "hostactive.h" #include "audiostream.h" +/* Implementations over-riding empty versions in lib_xud/sec/core/XUD_User.c */ + void XUD_UserSuspend(void) __attribute__ ((weak)); void XUD_UserSuspend(void) {