From 57932ee0df4f49643bd5ff40814dd2941e603df3 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 5 May 2020 16:36:11 +0100 Subject: [PATCH 1/3] Update fastmix.S --- lib_xua/src/core/mixer/fastmix.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/src/core/mixer/fastmix.S b/lib_xua/src/core/mixer/fastmix.S index 7f315bd7..139f203a 100644 --- a/lib_xua/src/core/mixer/fastmix.S +++ b/lib_xua/src/core/mixer/fastmix.S @@ -5,7 +5,7 @@ #define MIX_INPUTS 18 -#ifndef(__XS1A__) +#if defined(__XS2A__) || defined(__XS3A__) #define DOMIX_TOP(i) \ .cc_top doMix##i.function,doMix##i; \ From 23252ac3236fce0a843e94fba38870d02b82969b Mon Sep 17 00:00:00 2001 From: oscarbailey-xmos <40995889+oscarbailey-xmos@users.noreply.github.com> Date: Tue, 8 Dec 2020 15:53:32 +0000 Subject: [PATCH 2/3] Update copyright notice --- lib_xua/src/core/mixer/fastmix.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/src/core/mixer/fastmix.S b/lib_xua/src/core/mixer/fastmix.S index 139f203a..0ab9c0ff 100644 --- a/lib_xua/src/core/mixer/fastmix.S +++ b/lib_xua/src/core/mixer/fastmix.S @@ -1,4 +1,4 @@ -// Copyright (c) 2018, XMOS Ltd, All rights reserved +// Copyright (c) 2018-2020, XMOS Ltd, All rights reserved //#include "devicedefines.h" #define MAX_MIX_COUNT 8 From 9bdaf7ece6a42de016ca7bca18f3be5b672ad462 Mon Sep 17 00:00:00 2001 From: oscarbailey-xmos <40995889+oscarbailey-xmos@users.noreply.github.com> Date: Tue, 8 Dec 2020 15:57:39 +0000 Subject: [PATCH 3/3] Update CHANGELOG.rst --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9a8b1cf4..035c89e6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,7 @@ lib_xua Change Log 1.2.0 ----- + * ADDED: Updates for xcore.ai/XS3 compatibility * ADDED: Makefile.Win32 for xmosdfu on Windows * FIXED: Bump default BCD device number to v1.2.0 * FIXED: xmosdfu now fails with an error when given a directory (#119)