diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-08 19:20:39 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-08 19:20:39 +0000 |
| commit | 7f73cde984a9ce13a3f8308c0c72c394d00af9cc (patch) | |
| tree | 166b5c77bf8166aa218ea7b4532ac3ee7daff419 | |
| parent | f861470e797bef4d9d3aff7f9455c137f4afbba6 (diff) | |
| download | ChibiOS-7f73cde984a9ce13a3f8308c0c72c394d00af9cc.tar.gz ChibiOS-7f73cde984a9ce13a3f8308c0c72c394d00af9cc.tar.bz2 ChibiOS-7f73cde984a9ce13a3f8308c0c72c394d00af9cc.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2622 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/ports/GCC/ARMCMx/chcore_v6m.c | 2 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/chcore_v6m.h | 4 |
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
}
|