dengweijie/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Merge branch 'master' into feature/sync_buildsystems

Browse Source
This commit is contained in:
Ross Owen
2019-01-10 12:07:40 +00:00
committed by GitHub
parent 8340c4054b 87d2a3db26
commit d4300f0e5c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@@ -15,6 +15,7 @@ lib_xua Change Log
* RESOLVED: wChannelConfig in UAC1 descriptor set according to output channel * RESOLVED: wChannelConfig in UAC1 descriptor set according to output channel
count count
* RESOLVED: Indexing of ADAT channel strings (#18059) * RESOLVED: Indexing of ADAT channel strings (#18059)
* RESOLVED: Rebooting device fails when PLL config "not reset" bit is set
* Changes to dependencies: * Changes to dependencies:

4
lib_xua/src/core/support/reboot.xc
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved // Copyright (c) 2011-2019, XMOS Ltd, All rights reserved
#include <xs1.h> #include <xs1.h>
#include <platform.h> #include <platform.h>
#include <print.h> #include <print.h>
@@ -12,7 +12,7 @@
#if (XUD_SERIES_SUPPORT == 4) #if (XUD_SERIES_SUPPORT == 4)
#include "xs2_su_registers.h" #include "xs2_su_registers.h"
#define XS2_SU_PERIPH_USB_ID 0x1 #define XS2_SU_PERIPH_USB_ID 0x1
#define PLL_MASK 0x7FFFFFFF #define PLL_MASK 0x3FFFFFFF
#else #else
#define PLL_MASK 0xFFFFFFFF #define PLL_MASK 0xFFFFFFFF
#endif #endif

2
lib_xua/wscript
View File

@@ -106,4 +106,4 @@ def use_module(bld):
depends_on=module_build_info['DEPENDENT_MODULES'], depends_on=module_build_info['DEPENDENT_MODULES'],
includes=module_build_info['INCLUDE_DIRS'], includes=module_build_info['INCLUDE_DIRS'],
optional_headers=module_build_info['OPTIONAL_HEADERS'], optional_headers=module_build_info['OPTIONAL_HEADERS'],
version=module_build_info['VERSION']) version=module_build_info['VERSION'])