diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-08-05 21:57:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-08-05 21:57:49 +0000 |
| commit | dc0299c4649815ba8b5740fc8b211dad1d7bc3bd (patch) | |
| tree | aad85b8a93bf5ca1c243fb8ec154dd7c0e0ccd2e /nuttx/arch/arm/src/common | |
| parent | 8f0b435a518c39a6141bbf888aa4bcd879808d44 (diff) | |
| download | px4-nuttx-dc0299c4649815ba8b5740fc8b211dad1d7bc3bd.tar.gz px4-nuttx-dc0299c4649815ba8b5740fc8b211dad1d7bc3bd.tar.bz2 px4-nuttx-dc0299c4649815ba8b5740fc8b211dad1d7bc3bd.zip | |
Name change: Change Cortex-M3 naming to ARMv7-M naming so support Cortex-M4
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3846 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/common')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 2992812c3..43c8bbeeb 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -82,7 +82,7 @@ * a referenced is passed to get the state from the TCB. */ -#ifdef CONFIG_ARCH_CORTEXM3 +#if defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) # define up_savestate(regs) up_copystate(regs, (uint32_t*)current_regs) # define up_restorestate(regs) (current_regs = regs) #else @@ -121,7 +121,7 @@ extern uint32_t g_heapbase; /* Address of the saved user stack pointer */ #if CONFIG_ARCH_INTERRUPTSTACK > 3 -# ifdef CONFIG_ARCH_CORTEXM3 +#if defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) extern void g_intstackbase; # else extern uint32_t g_userstack; @@ -180,14 +180,14 @@ extern void up_sigdeliver(void); extern void up_irqinitialize(void); extern void up_maskack_irq(int irq); -#ifdef CONFIG_ARCH_CORTEXM3 +#if defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) extern uint32_t *up_doirq(int irq, uint32_t *regs); extern int up_svcall(int irq, FAR void *context); extern int up_hardfault(int irq, FAR void *context); extern int up_memfault(int irq, FAR void *context); -#else /* CONFIG_ARCH_CORTEXM3 */ +#else /* CONFIG_ARCH_CORTEXM3 || CONFIG_ARCH_CORTEXM4 */ extern void up_doirq(int irq, uint32_t *regs); #ifdef CONFIG_PAGING @@ -202,7 +202,7 @@ extern void up_prefetchabort(uint32_t *regs); extern void up_syscall(uint32_t *regs); extern void up_undefinedinsn(uint32_t *regs); -#endif /* CONFIG_ARCH_CORTEXM3 */ +#endif /* CONFIG_ARCH_CORTEXM3 || CONFIG_ARCH_CORTEXM4 */ extern void up_vectorundefinsn(void); extern void up_vectorswi(void); |