aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v6m.c2
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v6m.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.c b/os/ports/GCC/ARMCMx/chcore_v6m.c
index 246426f2c..dbff1d07c 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.c
@@ -62,7 +62,7 @@ CH_IRQ_HANDLER(SysTickVector) {
#if !defined(__DOXYGEN__)
__attribute__((naked))
#endif
-void _port_switch_from_irq(void) {
+void _port_switch_from_isr(void) {
/* Note, saves r4 to make space for the PC.*/
asm volatile ("push {r0, r1, r2, r3, r4} \n\t"
"mrs r0, APSR \n\t"
diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h
index 5ca439365..1bd2f777e 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.h
@@ -136,7 +136,7 @@ struct intctx {
\
asm volatile ("mrs %0, PSP" : "=r" (ctxp) : ); \
_port_saved_pc = ctxp->pc; \
- ctxp->pc = _port_switch_from_irq; \
+ ctxp->pc = _port_switch_from_isr; \
return; \
} \
port_unlock_from_isr(); \
@@ -237,7 +237,7 @@ extern "C" {
#endif
void port_halt(void);
void port_switch(Thread *ntp, Thread *otp);
- void _port_switch_from_irq(void);
+ void _port_switch_from_isr(void);
void _port_thread_start(void);
#ifdef __cplusplus
}