michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: cmsis: Convert _ScbHardFaultIsForced to use direct CMSIS register access

Browse source 
Jira: ZEP-1568

Change-Id: I9bf2ec4c84f87c8e9d72dc41324d7ee627d2dc2e
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2017-01-27 20:39:52 -06:00 • committed by Maureen Helm
commit 831764a898
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/fault.c
View file

@ -64,7 +64,7 @@ void _FaultDump(const NANO_ESF *esf, int fault)
int escalation = 0;
if (3 == fault) { /* hard fault */
escalation = _ScbHardFaultIsForced();
escalation = SCB->HFSR & SCB_HFSR_FORCED_Msk;
PR_EXC("HARD FAULT: %s\n",
escalation ? "Escalation (see below)!"
: "Bus fault on vector table read\n");
@ -259,7 +259,7 @@ static void _HardFault(const NANO_ESF *esf)
#elif defined(CONFIG_ARMV7_M)
if (_ScbHardFaultIsBusErrOnVectorRead()) {
PR_EXC(" Bus fault on vector table read\n");
} else if (_ScbHardFaultIsForced()) {
} else if (SCB->HFSR & SCB_HFSR_FORCED_Msk) {
PR_EXC(" Fault escalation (see below)\n");
if (_ScbIsMemFault()) {
_MpuFault(esf, 1);