aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorisiora <none@example.com>2017-11-22 09:54:55 +0000
committerisiora <none@example.com>2017-11-22 09:54:55 +0000
commit02dab23663eba4f39b580cdb1eaa14b9560f7099 (patch)
tree8b46021dc1e321670505db0b01184d9d163581cc /os
parentd1c421d0c8355a457fcdf1c7f751212dbe785b97 (diff)
downloadChibiOS-02dab23663eba4f39b580cdb1eaa14b9560f7099.tar.gz
ChibiOS-02dab23663eba4f39b580cdb1eaa14b9560f7099.tar.bz2
ChibiOS-02dab23663eba4f39b580cdb1eaa14b9560f7099.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11054 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/common/ports/ARMCAx-TZ/compilers/GCC/monitor.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/os/common/ports/ARMCAx-TZ/compilers/GCC/monitor.S b/os/common/ports/ARMCAx-TZ/compilers/GCC/monitor.S
index 9b6a1e0f4..e6b3560e5 100644
--- a/os/common/ports/ARMCAx-TZ/compilers/GCC/monitor.S
+++ b/os/common/ports/ARMCAx-TZ/compilers/GCC/monitor.S
@@ -63,7 +63,7 @@
.set SCR_FW, 0x10
.set SCR_AW, 0x20
- .set MON_S_SCR, (SCR_IRQ)
+ .set MON_S_SCR, (SCR_IRQ) // (SCR_EA|SCR_IRQ)
.set MON_NS_SCR, (SCR_FIQ|SCR_NS)
.set MSG_OK, 0
@@ -139,8 +139,8 @@ sm_fiq:
mov r1, lr
msr CPSR_c, #MODE_SYS | I_BIT | F_BIT
stmfd sp!, {r0, r1} // push R0=SPSR, R1=LR_MON.
-
- ldr r0, =_ns_thread // check point: ns_tread != 0
+ // check point: ns_tread != 0
+ ldr r0, =_ns_thread
mov r1, #MSG_TIMEOUT
#if CH_DBG_SYSTEM_STATE_CHECK
bl _dbg_check_lock