diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-26 19:59:17 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-26 19:59:17 +0000 |
| commit | a3ff693ec26be03c643906cb346aa3dcd040a673 (patch) | |
| tree | c45d00d1d814406aeb0515a66d8887fed114828c /cpukit/score/cpu/arm | |
| parent | 2007-11-26 Ray Xu <rayx.cn@gmail.com> (diff) | |
| download | rtems-a3ff693ec26be03c643906cb346aa3dcd040a673.tar.bz2 | |
2007-11-26 Ray Xu <rayx.cn@gmail.com>
* cpu.c, score/cpu.h: Fix headers. Remove extra inline definition.
* cpu_asm.S: Note origin of Thumb support.
Diffstat (limited to 'cpukit/score/cpu/arm')
| -rw-r--r-- | cpukit/score/cpu/arm/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/cpu.c | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/cpu_asm.S | 3 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/rtems/score/cpu.h | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index 760adf21de..18b2a878a6 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,8 @@ +2007-11-26 Ray Xu <rayx.cn@gmail.com> + + * cpu.c, score/cpu.h: Fix headers. Remove extra inline definition. + * cpu_asm.S: Note origin of Thumb support. + 2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com> * cpu.c: Fix headers. diff --git a/cpukit/score/cpu/arm/cpu.c b/cpukit/score/cpu/arm/cpu.c index ed8f3fdb3d..9af0fe3dd0 100644 --- a/cpukit/score/cpu/arm/cpu.c +++ b/cpukit/score/cpu/arm/cpu.c @@ -8,6 +8,8 @@ * Copyright (c) 2002 Advent Networks, Inc * Jay Monkman <jmonkman@adventnetworks.com> * + * Copyright (c) 2007 Ray xu <rayx.cn@gmail.com> + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. diff --git a/cpukit/score/cpu/arm/cpu_asm.S b/cpukit/score/cpu/arm/cpu_asm.S index 5001d9bebb..79882b294d 100644 --- a/cpukit/score/cpu/arm/cpu_asm.S +++ b/cpukit/score/cpu/arm/cpu_asm.S @@ -4,6 +4,9 @@ * This file contains all assembly code for the ARM implementation * of RTEMS. * + * Copyright (c) 2007 by Ray Xu, <Rayx.cn@gmail.com> + * Thumb support added. + * * Copyright (c) 2002 by Advent Networks, Inc. * Jay Monkman <jmonkman@adventnetworks.com> * diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h index cf99701e9c..cf712589ee 100644 --- a/cpukit/score/cpu/arm/rtems/score/cpu.h +++ b/cpukit/score/cpu/arm/rtems/score/cpu.h @@ -8,6 +8,8 @@ * This include file contains information pertaining to the ARM * processor. * + * Copyright (c) 2007 Ray Xu <Rayx.cn@gmail.com> + * * Copyright (c) 2006 OAR Corporation * * Copyright (c) 2002 Advent Networks, Inc. @@ -514,7 +516,7 @@ SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; */ #if (defined(__THUMB_INTERWORK__) || defined(__thumb__)) -extern unsigned int _CPU_ISR_Disable_Thumb(void) __attribute__ ((naked)); +extern uint32_t _CPU_ISR_Disable_Thumb(void) __attribute__ ((naked)); extern void _CPU_ISR_Enable_Thumb( int ) __attribute__ ((naked)); extern void _CPU_ISR_Flash_Thumb(int) __attribute__ ((naked)); extern void _CPU_ISR_Set_level_Thumb(int ) __attribute__ ((naked)); |