From a7d3226554955b2f24cd99515e2d51a350fd9b8a Mon Sep 17 00:00:00 2001 From: samux Date: Tue, 2 Jul 2013 14:40:51 +0100 Subject: [PATCH] pyOCD: fix CDBGPWRUPACK - CSYSPWRUPACK --- workspace_tools/debugger/pyOCD/target/cortex_m.py | 2 +- workspace_tools/debugger/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workspace_tools/debugger/pyOCD/target/cortex_m.py b/workspace_tools/debugger/pyOCD/target/cortex_m.py index 8cdd9311be..f612e0f67d 100644 --- a/workspace_tools/debugger/pyOCD/target/cortex_m.py +++ b/workspace_tools/debugger/pyOCD/target/cortex_m.py @@ -167,7 +167,7 @@ class CortexM(Target): while True: r = self.transport.readDP(DP_REG['CTRL_STAT']) - if (r & (CDBGPWRUPACK | CSYSPWRUPACK)) != (CSYSPWRUPREQ | CDBGPWRUPREQ): + if (r & (CDBGPWRUPACK | CSYSPWRUPACK)) != (CDBGPWRUPACK | CSYSPWRUPACK): break self.transport.writeDP(DP_REG['CTRL_STAT'], CSYSPWRUPREQ | CDBGPWRUPREQ | TRNNORMAL | MASKLANE) diff --git a/workspace_tools/debugger/setup.py b/workspace_tools/debugger/setup.py index 06e0e5ee06..f61df3abaf 100644 --- a/workspace_tools/debugger/setup.py +++ b/workspace_tools/debugger/setup.py @@ -23,7 +23,7 @@ setup( description="CMSIS-DAP debugger for python", author="samux", author_email="samuel.mokrani@gmail.com", - license="MIT", + license="Apache 2.0", classifiers = [ "Development Status :: 4 - Beta", "License :: Apache 2.0",