diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-24 12:56:51 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-24 12:56:51 +0000 |
| commit | c5ed14844e379eaefaf6cfe27f54d9f17f8984e1 (patch) | |
| tree | 1102b1d3f7df560af2b99f3bdc23f25618239290 /cpukit/score/cpu/arm/cpu.c | |
| parent | 2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-c5ed14844e379eaefaf6cfe27f54d9f17f8984e1.tar.bz2 | |
2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/armv7m.h, armv7m-context-initialize.c,
armv7m-context-restore.c, armv7m-context-switch.c,
armv7m-exception-handler-get.c, armv7m-exception-handler-set.c,
armv7m-exception-priority-get.c, armv7m-exception-priority-set.c,
armv7m-initialize.c, armv7m-isr-dispatch.c, armv7m-isr-enter-leave.c,
armv7m-isr-level-get.c, armv7m-isr-level-set.c,
armv7m-isr-vector-install.c, armv7m-multitasking-start-stop.c: New
files.
* Makefile.am, preinstall.am: Reflect changes above.
* rtems/score/arm.h: Define ARM_MULTILIB_ARCH_V4 and
ARM_MULTILIB_ARCH_V7M.
* rtems/score/cpu.h, cpu_asm.S, cpu.c, arm_exc_abort.S,
arm_exc_handler_high.c, arm_exc_handler_low.S, arm_exc_interrupt.S:
Define CPU_HAS_HARDWARE_INTERRUPT_STACK to FALSE. Use
ARM_MULTILIB_ARCH_V4 and ARM_MULTILIB_ARCH_V7M.
Diffstat (limited to 'cpukit/score/cpu/arm/cpu.c')
| -rw-r--r-- | cpukit/score/cpu/arm/cpu.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cpukit/score/cpu/arm/cpu.c b/cpukit/score/cpu/arm/cpu.c index 00ff4aabcd..89f5ce2d7a 100644 --- a/cpukit/score/cpu/arm/cpu.c +++ b/cpukit/score/cpu/arm/cpu.c @@ -15,7 +15,7 @@ * * Copyright (c) 2007 Ray xu <rayx.cn@gmail.com> * - * Copyright (c) 2009 embedded brains GmbH + * Copyright (c) 2009-2011 embedded brains GmbH * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -36,6 +36,8 @@ #include <rtems/score/thread.h> #include <rtems/score/cpu.h> +#ifdef ARM_MULTILIB_ARCH_V4 + /* * This variable can be used to change the running mode of the execution * contexts. @@ -44,14 +46,14 @@ uint32_t arm_cpu_mode = 0x13; void _CPU_Context_Initialize( Context_Control *the_context, - uint32_t *stack_base, - uint32_t size, + void *stack_area_begin, + size_t stack_area_size, uint32_t new_level, - void *entry_point, + void (*entry_point)( void ), bool is_fp ) { - the_context->register_sp = (uint32_t) stack_base + size ; + the_context->register_sp = (uint32_t) stack_area_begin + stack_area_size; the_context->register_lr = (uint32_t) entry_point; the_context->register_cpsr = new_level | arm_cpu_mode; } @@ -114,12 +116,9 @@ void _CPU_ISR_install_vector( } } -void _CPU_Install_interrupt_stack( void ) -{ - /* This function is empty since the BSP must set up the interrupt stacks */ -} - void _CPU_Initialize( void ) { /* Do nothing */ } + +#endif /* ARM_MULTILIB_ARCH_V4 */ |