aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports/GCC/ARMCMx/chcore_v6m.c
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-04-02 13:00:14 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-04-02 13:00:14 +0000
commit3b451678d40e481f5ffd05b93c40aeaa812991b6 (patch)
treed3a9560ed120312754f22f78dc359d91b4b117e2 /os/ports/GCC/ARMCMx/chcore_v6m.c
parentcec33ff0e62d3666f6a1828d78891d63da191e20 (diff)
downloadChibiOS-3b451678d40e481f5ffd05b93c40aeaa812991b6.tar.gz
ChibiOS-3b451678d40e481f5ffd05b93c40aeaa812991b6.tar.bz2
ChibiOS-3b451678d40e481f5ffd05b93c40aeaa812991b6.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1832 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/GCC/ARMCMx/chcore_v6m.c')
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v6m.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.c b/os/ports/GCC/ARMCMx/chcore_v6m.c
index 8f8a0a100..8c367daf8 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.c
@@ -84,6 +84,7 @@ void _port_switch_from_irq(void) {
"mov r12, r1 \n\t" \
"msr APSR, r0 \n\t" \
"mov lr, r2 \n\t" \
+ "cpsie i \n\t" \
"pop {r0, r1, r2, r3, pc}");
}