diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-03 12:20:25 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-03 12:20:25 +0000 |
| commit | ed4c276d6e9abd145b2a21afb12d58df61876a97 (patch) | |
| tree | 84e41592cc98d5637930e4d1bd8abdeec9aa18c2 /os/rt | |
| parent | 1d8a7907bd3416502440c509d1ce82744bb8ead0 (diff) | |
| download | ChibiOS-ed4c276d6e9abd145b2a21afb12d58df61876a97.tar.gz ChibiOS-ed4c276d6e9abd145b2a21afb12d58df61876a97.tar.bz2 ChibiOS-ed4c276d6e9abd145b2a21afb12d58df61876a97.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6254 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt')
| -rw-r--r-- | os/rt/ports/ARMCMx/chcore_v6m.c | 4 | ||||
| -rw-r--r-- | os/rt/ports/ARMCMx/chcore_v7m.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.c b/os/rt/ports/ARMCMx/chcore_v6m.c index 78e796087..4886496da 100644 --- a/os/rt/ports/ARMCMx/chcore_v6m.c +++ b/os/rt/ports/ARMCMx/chcore_v6m.c @@ -128,12 +128,12 @@ void _port_irq_epilogue(regarm_t lr) { required or not.*/
if (chSchIsPreemptionRequired()) {
/* Preemption is required we need to enforce a context switch.*/
- ctxp->pc = (void *)_port_switch_from_isr;
+ ctxp->pc = (regarm_t)_port_switch_from_isr;
}
else {
/* Preemption not required, we just need to exit the exception
atomically.*/
- ctxp->pc = (void *)_port_exit_from_isr;
+ ctxp->pc = (regarm_t)_port_exit_from_isr;
}
/* Note, returning without unlocking is intentional, this is done in
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.c b/os/rt/ports/ARMCMx/chcore_v7m.c index 4cd5db64a..49826c48c 100644 --- a/os/rt/ports/ARMCMx/chcore_v7m.c +++ b/os/rt/ports/ARMCMx/chcore_v7m.c @@ -138,7 +138,7 @@ void _port_irq_epilogue(void) { required or not.*/
if (chSchIsPreemptionRequired()) {
/* Preemption is required we need to enforce a context switch.*/
- ctxp->pc = (void *)_port_switch_from_isr;
+ ctxp->pc = (regarm_t)_port_switch_from_isr;
#if CORTEX_USE_FPU
/* Enforcing a lazy FPU state save by accessing the FPCSR register.*/
(void) __get_FPSCR();
@@ -147,7 +147,7 @@ void _port_irq_epilogue(void) { else {
/* Preemption not required, we just need to exit the exception
atomically.*/
- ctxp->pc = (void *)_port_exit_from_isr;
+ ctxp->pc = (regarm_t)_port_exit_from_isr;
}
#if CORTEX_USE_FPU
|