summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-18 20:54:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-18 20:54:19 +0000
commit4a0d87ee09cb3c1d3cb98d2907a046a463777c3e (patch)
treee709cfe0c0073b139395d60fc3fe15d57c5204f5 /cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
parent2002-04-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-4a0d87ee09cb3c1d3cb98d2907a046a463777c3e.tar.bz2
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h')
-rw-r--r--cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h17
1 files changed, 7 insertions, 10 deletions
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 <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 )