From ffee831f5d40015b0a35d88c063c7fe2636c49fa Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 6 Aug 2021 08:52:36 +0100 Subject: [PATCH 1/2] Updated clock blocks to support lib_xud v2.0.0 --- CHANGELOG.rst | 6 ++++++ lib_xua/module_build_info | 4 ++-- lib_xua/src/core/uac_hwresources.h | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cd8418c7..565a47f3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ lib_xua Change Log ================== +2.1.0 +----- + + * CHANGED: Updated clock blocks to support lib_xud v2.0.0 + * CHANGED: Updated dependency on lib_xud to v2.0.0 for use by XVF3600 + 2.0.1 ----- diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index c66ce139..3c6d1f6e 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -1,8 +1,8 @@ -VERSION = 2.0.1 +VERSION = 2.1.0 DEPENDENT_MODULES = lib_logging(>=3.0.0) \ lib_xassert(>=4.0.0) \ - lib_xud(>=1.2.0) \ + lib_xud(>=2.0.0) \ lib_spdif(>=4.0.0) \ lib_mic_array(>=4.0.0) diff --git a/lib_xua/src/core/uac_hwresources.h b/lib_xua/src/core/uac_hwresources.h index a0b82d58..47f39883 100644 --- a/lib_xua/src/core/uac_hwresources.h +++ b/lib_xua/src/core/uac_hwresources.h @@ -9,9 +9,9 @@ #define CLKBLK_MIDI XS1_CLKBLK_REF; #define CLKBLK_SPDIF_TX XS1_CLKBLK_1 #define CLKBLK_SPDIF_RX XS1_CLKBLK_1 -#define CLKBLK_MCLK XS1_CLKBLK_4 +#define CLKBLK_MCLK XS1_CLKBLK_2 #define CLKBLK_FLASHLIB XS1_CLKBLK_3 /* Clock block for use by flash lib */ #define CLKBLK_ADAT_RX XS1_CLKBLK_REF /* Use REF for ADAT_RX on U/x200 series */ -#define CLKBLK_I2S_BIT XS1_CLKBLK_5 +#define CLKBLK_I2S_BIT XS1_CLKBLK_3 #endif /* _UAC_HWRESOURCES_H_ */ From 8e0559571079573750ffd0293ade52a123a962f3 Mon Sep 17 00:00:00 2001 From: lucianom Date: Fri, 6 Aug 2021 10:21:38 +0100 Subject: [PATCH 2/2] Update clock in unit test --- tests/xua_unit_tests/src/xua_unit_test_helper.xc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xua_unit_tests/src/xua_unit_test_helper.xc b/tests/xua_unit_tests/src/xua_unit_test_helper.xc index d4c2911c..a2df0db9 100644 --- a/tests/xua_unit_tests/src/xua_unit_test_helper.xc +++ b/tests/xua_unit_tests/src/xua_unit_test_helper.xc @@ -13,7 +13,7 @@ in port p_mclk_in = XS1_PORT_1D; /* Clock-block declarations */ clock clk_audio_bclk = on tile[0]: XS1_CLKBLK_1; /* Bit clock */ -clock clk_audio_mclk = on tile[0]: XS1_CLKBLK_4; /* Master clock */ +clock clk_audio_mclk = on tile[0]: XS1_CLKBLK_2; /* Master clock */ // Supply missing but unused function void AudioHwConfig(unsigned samFreq, unsigned mClk, unsigned dsdMode, unsigned sampRes_DAC, unsigned sampRes_ADC)