kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 14:03:55 +01:00
Code Releases Activity

Merge pull request #435 from OlegHahm/fix_assembler_ifdef

Browse Source 
macros are not handled by the preprocessor in ASM
This commit is contained in:
Thomas Eichinger 2013-12-18 11:53:27 -08:00
commit cfa8879760
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/arm_common/common.s
View File

@ -136,15 +136,15 @@ arm_irq_handler:
MRS R1, CPSR
MSR SPSR, R1
#if CPU != mc1322x
.if CPU != mc1322x
/* jump into vic interrupt */
mov r0, #0xffffff00 /* lpc23xx */
ldr r0, [r0]
add lr,pc,#4
#else
.else
/* mc1322x seems to lack a VIC, distinction of IRQ has to be done in SW */
ldr r0, =isr /* mc1322x */
#endif
.endif
mov pc, r0