andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2622 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2011-01-08 19:20:39 +00:00
parent f861470e79
commit 7f73cde984
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/ports/GCC/ARMCMx/chcore_v6m.c
View File

@ -62,7 +62,7 @@ CH_IRQ_HANDLER(SysTickVector) {
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
__attribute__((naked)) __attribute__((naked))
#endif #endif
void _port_switch_from_irq(void) { void _port_switch_from_isr(void) {
/* Note, saves r4 to make space for the PC.*/ /* Note, saves r4 to make space for the PC.*/
asm volatile ("push {r0, r1, r2, r3, r4} \n\t" asm volatile ("push {r0, r1, r2, r3, r4} \n\t"
"mrs r0, APSR \n\t" "mrs r0, APSR \n\t"

4
os/ports/GCC/ARMCMx/chcore_v6m.h
View File

@ -136,7 +136,7 @@ struct intctx {
\ \
asm volatile ("mrs %0, PSP" : "=r" (ctxp) : ); \ asm volatile ("mrs %0, PSP" : "=r" (ctxp) : ); \
_port_saved_pc = ctxp->pc; \ _port_saved_pc = ctxp->pc; \
ctxp->pc = _port_switch_from_irq; \ ctxp->pc = _port_switch_from_isr; \
return; \ return; \
} \ } \
port_unlock_from_isr(); \ port_unlock_from_isr(); \
@ -237,7 +237,7 @@ extern "C" {
#endif #endif
void port_halt(void); void port_halt(void);
void port_switch(Thread *ntp, Thread *otp); void port_switch(Thread *ntp, Thread *otp);
void _port_switch_from_irq(void); void _port_switch_from_isr(void);
void _port_thread_start(void); void _port_thread_start(void);
#ifdef __cplusplus #ifdef __cplusplus
} }