From 532c872902d6f9603a1e93b1b5f1bfa951a37bb1 Mon Sep 17 00:00:00 2001 From: Luciano Martin Date: Wed, 9 Jan 2019 17:17:15 +0000 Subject: [PATCH 1/5] Fix PLL mask to reset tile --- lib_xua/src/core/support/reboot.xc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/src/core/support/reboot.xc b/lib_xua/src/core/support/reboot.xc index 280b0b44..19fce62b 100644 --- a/lib_xua/src/core/support/reboot.xc +++ b/lib_xua/src/core/support/reboot.xc @@ -12,7 +12,7 @@ #if (XUD_SERIES_SUPPORT == 4) #include "xs2_su_registers.h" #define XS2_SU_PERIPH_USB_ID 0x1 -#define PLL_MASK 0x7FFFFFFF +#define PLL_MASK 0x3FFFFFFF #else #define PLL_MASK 0xFFFFFFFF #endif From 868b17a5ff19a4f67e13dd77df609a96d30e2f4c Mon Sep 17 00:00:00 2001 From: Luciano Martin Date: Wed, 9 Jan 2019 17:39:15 +0000 Subject: [PATCH 2/5] Update lib version and copyright --- CHANGELOG.rst | 5 +++++ lib_xua/module_build_info | 2 +- lib_xua/src/core/support/reboot.xc | 2 +- lib_xua/wscript | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f96a4797..c3016409 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ lib_xua Change Log ================== +0.2.1 +----- + + * FIXED: reset tile in case second highest PLL register bit is set to 1 + 0.2.0 ----- diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index 3460a1ed..28d8b938 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -13,7 +13,7 @@ MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -DREF_CLK_FREQ=100 -fasm-linenum -fcomment-a OPTIONAL_HEADERS += xua_conf.h -VERSION = 0.2.0 +VERSION = 0.2.1 DEPENDENT_MODULES = lib_logging(>=2.1.0) lib_xud(>=0.1.0) lib_spdif(>=3.0.0) diff --git a/lib_xua/src/core/support/reboot.xc b/lib_xua/src/core/support/reboot.xc index 19fce62b..fbc11f6c 100644 --- a/lib_xua/src/core/support/reboot.xc +++ b/lib_xua/src/core/support/reboot.xc @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved +// Copyright (c) 2011-2019, XMOS Ltd, All rights reserved #include #include #include diff --git a/lib_xua/wscript b/lib_xua/wscript index d7d30c1b..2edcbf33 100644 --- a/lib_xua/wscript +++ b/lib_xua/wscript @@ -32,4 +32,4 @@ def use_module(bld): depends_on=depends_on, includes=['api'], optional_headers='xua_conf.h', - version='1.0.0') + version='0.2.1') From 1d09916b54f8f30b17cbfea500dcf26877d0bbe7 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 10 Jan 2019 12:04:37 +0000 Subject: [PATCH 3/5] Update CHANGELOG.rst --- CHANGELOG.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c3016409..ccfe6cd5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,6 @@ lib_xua Change Log ================== -0.2.1 ------ - - * FIXED: reset tile in case second highest PLL register bit is set to 1 - 0.2.0 ----- @@ -20,6 +15,7 @@ lib_xua Change Log * RESOLVED: wChannelConfig in UAC1 descriptor set according to output channel count * RESOLVED: Indexing of ADAT channel strings (#18059) + * RESOLVED: Rebooting device fails when PLL config "not reset" bit is set * Changes to dependencies: From b6b26f252ef78761616d5e0707aabb8c09957c67 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 10 Jan 2019 12:04:49 +0000 Subject: [PATCH 4/5] Update module_build_info --- 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 28d8b938..3460a1ed 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -13,7 +13,7 @@ MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -DREF_CLK_FREQ=100 -fasm-linenum -fcomment-a OPTIONAL_HEADERS += xua_conf.h -VERSION = 0.2.1 +VERSION = 0.2.0 DEPENDENT_MODULES = lib_logging(>=2.1.0) lib_xud(>=0.1.0) lib_spdif(>=3.0.0) From 533ec7b5df7aea535d6c8d747bbd9ffc5ce5ae9c Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 10 Jan 2019 12:05:04 +0000 Subject: [PATCH 5/5] Update wscript --- lib_xua/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/wscript b/lib_xua/wscript index 2edcbf33..93670c94 100644 --- a/lib_xua/wscript +++ b/lib_xua/wscript @@ -32,4 +32,4 @@ def use_module(bld): depends_on=depends_on, includes=['api'], optional_headers='xua_conf.h', - version='0.2.1') + version='0.2.0')