From 4a0d87ee09cb3c1d3cb98d2907a046a463777c3e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Apr 2002 20:54:19 +0000 Subject: 2002-04-18 Ralf Corsepius * asm.h: Include cpuopts.h instead of targopts.h. * rtems/new-exceptions/cpu.h: Relocated from libbsp/powerpc/support/new_exception_processing/rtems/score/cpu.h * rtems/old-exceptions/cpu.h: Relocated from c/src/lib/libbsp/powerpc/support/old_exception_processing/rtems/score/cpu.h * rtems/powerpc/registers.h: Relocated and renamed from libcpu/powerpc/shared/include/cpu.h. * rtems/score/cpu.h: New. * Makefile.am: Reflect changes above. --- cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'cpukit/score/cpu/powerpc/rtems/new-exceptions') diff --git a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h index 81ce3c8dc4..371626cd4b 100644 --- a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h @@ -36,15 +36,14 @@ #ifndef __CPU_h #define __CPU_h -#ifdef __cplusplus -extern "C" { +#ifndef _rtems_score_cpu_h +#error "You should include " #endif -#include /* pick up machine definitions */ -#include - -#ifndef ASM -#include +#include + +#ifdef __cplusplus +extern "C" { #endif /* conditional compilation parameters */ @@ -454,7 +453,7 @@ typedef struct { boolean timer_internal_clock; /* TRUE, when timer runs with CPU clk */ #endif -#if (defined(mpc860) || defined(mpc821) || defined( mpc8260)) +#if (defined(mpc860) || defined(mpc821) || defined(mpc8260)) unsigned32 clock_speed; /* Speed of CPU in Hz */ #endif } rtems_cpu_table; @@ -647,8 +646,6 @@ SCORE_EXTERN struct { * level is returned in _isr_cookie. */ -#define loc_string(a,b) a " (" #b ")\n" - #ifndef ASM static inline unsigned32 _CPU_ISR_Get_level( void ) -- cgit v1.2.3