From 4f0b287a4aa0d948d61f5c2ef1915c4db24f30e9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 17 Jul 2002 17:14:31 +0000 Subject: 2002-07-17 Jay Monkman * rtems/score/cpu_asm.h: Enhanced to include register offsets. * Makefile.am: Install rtems/score/cpu_asm.h. * cpu.c: Significantly enhanced including the implementation of _CPU_ISR_Get_level. * cpu_asm.S: Improved behavior of context switch and interrupt dispatching. * rtems/score/arm.h: Improved the CPU model name determination. * rtems/score/cpu.h: Improved interrupt disable/enable functions. --- cpukit/score/cpu/arm/rtems/score/arm.h | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'cpukit/score/cpu/arm/rtems/score/arm.h') diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h index 7994d7150b..05aed89892 100644 --- a/cpukit/score/cpu/arm/rtems/score/arm.h +++ b/cpukit/score/cpu/arm/rtems/score/arm.h @@ -1,12 +1,13 @@ -/* no_cpu.h - * - * This file is an example (i.e. "no CPU") of the file which is - * created for each CPU family port of RTEMS. +/* + * $Id$ * * * COPYRIGHT (c) 2000 Canon Research Centre France SA. * Emmanuel Raguet, mailto:raguet@crf.canon.fr * + * Copyright (c) 2002 Advent Networks, Inc. + * Jay Monkman + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.OARcorp.com/rtems/license.html. @@ -28,16 +29,23 @@ extern "C" { * dependent features are present in a particular member * of the family. */ - -#if defined(__arm__) - -#define CPU_MODEL_NAME "arm" -#define ARM_HAS_FPU 0 - +#if defined(__arm9__) +# define CPU_MODEL_NAME "arm9" +# define ARM_HAS_FPU 0 +#elif defined(__arm9tdmi__) +# define CPU_MODEL_NAME "arm9tdmi" +# define ARM_HAS_FPU 0 +#elif defined(__arm7__) +# define CPU_MODEL_NAME "arm7" +# define ARM_HAS_FPU 0 +#elif defined(__arm7tdmi__) +# define CPU_MODEL_NAME "arm7tdmi" +# define ARM_HAS_FPU 0 +#elif defined(__arm__) +# define CPU_MODEL_NAME "unknown ARM" +# define ARM_HAS_FPU 0 #else - -#error "Unsupported CPU Model" - +# error "Unsupported CPU Model" #endif /* -- cgit v1.2.3