From 9cf931898e16bfff3016d6d0f9127764f211c3d9 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 17 May 2023 14:55:37 +0100 Subject: [PATCH 1/5] Move check for XUA_USB_EN after include of xua.h (#325) --- CHANGELOG.rst | 3 ++- lib_xua/src/core/audiohub/audiohub_dsd.h | 4 ++-- lib_xua/src/core/xuduser/xuduser.c | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ede260eb..65b61c40 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,8 @@ UNRELEASED ---------- * FIXED: Memory corruption during initialisation of mixer weights - * FIXED: Exception when entering DSD mode + * FIXED: UserHostActive() not being called as expected (#326) + * FIXED; Exception when entering DSD mode 3.4.0 ----- diff --git a/lib_xua/src/core/audiohub/audiohub_dsd.h b/lib_xua/src/core/audiohub/audiohub_dsd.h index 4cfa8126..80af207b 100644 --- a/lib_xua/src/core/audiohub/audiohub_dsd.h +++ b/lib_xua/src/core/audiohub/audiohub_dsd.h @@ -1,4 +1,4 @@ -// Copyright 2018-2022 XMOS LIMITED. +// Copyright 2018-2023 XMOS LIMITED. // This Software is subject to the terms of the XMOS Public Licence: Version 1. #if (DSD_CHANS_DAC != 0) @@ -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) { From 2dba6dce36a9486132ddedf077fbf7538e8cb5fa Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 18 May 2023 10:04:36 +0100 Subject: [PATCH 2/5] Update CHANGELOG.rst --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 65b61c40..d4305996 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,9 +4,9 @@ lib_xua Change Log UNRELEASED ---------- - * FIXED: Memory corruption during initialisation of mixer weights + * FIXED: Memory corruption due erroneous initialisation of mixer weights when not in use (#152) * FIXED: UserHostActive() not being called as expected (#326) - * FIXED; Exception when entering DSD mode + * FIXED; Exception when entering DSD mode (#327) 3.4.0 ----- From 12ec1d7536467caf4ed35e7ff8979b64b3916fba Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 18 May 2023 10:05:30 +0100 Subject: [PATCH 3/5] module_build_info: lib_xud 2.2.2 -> 2.2.3 --- lib_xua/module_build_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index 2a883cbb..b95b65f6 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -13,7 +13,7 @@ DEPENDENT_MODULES = lib_locks(>=2.1.0) \ lib_mic_array(>=4.5.0) \ lib_spdif(>=4.2.1) \ lib_xassert(>=4.1.0) \ - lib_xud(>=2.2.2) \ + lib_xud(>=2.2.3) \ lib_adat(>=1.0.0) MODULE_XCC_FLAGS = $(XCC_FLAGS) \ From 761a33f5e4edfa271d55ee7cc3f89e7e2c092791 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 18 May 2023 10:07:25 +0100 Subject: [PATCH 4/5] Update CHANGELOG.rst --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d4305996..d95b28c8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,9 +4,9 @@ lib_xua Change Log UNRELEASED ---------- - * FIXED: Memory corruption due erroneous initialisation of mixer weights when not in use (#152) + * FIXED: Memory corruption due to erroneous initialisation of mixer weights when not in use (#152) * FIXED: UserHostActive() not being called as expected (#326) - * FIXED; Exception when entering DSD mode (#327) + * FIXED: Exception when entering DSD mode 3.4.0 ----- From 23d043630f71d16f2c49cb08a891a85f5db2cb97 Mon Sep 17 00:00:00 2001 From: Daniel Pieczko Date: Thu, 18 May 2023 16:19:50 +0100 Subject: [PATCH 5/5] Use withVS instead of runVS to use the latest Jenkins Windows agents --- Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb1ed889..d37e570e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('xmos_jenkins_shared_library@v0.21.0') _ +@Library('xmos_jenkins_shared_library@v0.24.0') _ getApproval() @@ -145,10 +145,14 @@ pipeline { dir("${REPO}") { checkout scm dir("${REPO}/host/xmosdfu") { - runVS('nmake /f Makefile.Win32') + withVS("vcvars32.bat") { + bat "nmake /f Makefile.Win32" + } } dir("host_usb_mixer_control") { - runVS('msbuild host_usb_mixer_control.vcxproj /property:Configuration=Release /property:Platform=x64') + withVS() { + bat 'msbuild host_usb_mixer_control.vcxproj /property:Configuration=Release /property:Platform=x64' + } sh 'mkdir Win/x64' sh 'mv bin/Release/x64/host_usb_mixer_control.exe Win/x64/xmos_mixer.exe' archiveArtifacts artifacts: "Win/x64/xmos_mixer.exe", fingerprint: true