diff options
Diffstat (limited to 'c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h')
| -rw-r--r-- | c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h b/c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h index 81ce3c8dc4..371626cd4b 100644 --- a/c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h +++ b/c/src/exec/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 <rtems/score/cpu.h>" #endif -#include <rtems/score/ppc.h> /* pick up machine definitions */ -#include <libcpu/cpu.h> - -#ifndef ASM -#include <rtems/score/types.h> +#include <rtems/powerpc/registers.h> + +#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 ) |