diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-13 07:42:56 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-13 07:42:56 +0000 |
commit | 94e2b11f8a2e827e658a092a9ddaa495877a6c49 (patch) | |
tree | bc6bd041d2aab2ac3975c094fd34a8654250b102 | |
parent | 2005-02-13 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-94e2b11f8a2e827e658a092a9ddaa495877a6c49.tar.bz2 |
2005-02-13 Ralf Corsepius <ralf.corsepius@rtems.org>
* rtems/score/powerpc.h: Remove PPC_MSR_* defines.
-rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/score/powerpc.h | 52 |
2 files changed, 4 insertions, 52 deletions
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 2b1018ab2b..ae98c67987 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,5 +1,9 @@ 2005-02-13 Ralf Corsepius <ralf.corsepius@rtems.org> + * rtems/score/powerpc.h: Remove PPC_MSR_* defines. + +2005-02-13 Ralf Corsepius <ralf.corsepius@rtems.org> + * rtems/old-exceptions/cpu.h: Add _PPC_MSR_DISABLE_MASK. Use _PPC_MSR_DISABLE_MASK instead of PPC_MSR_DISABLE_MASK to set up _disable_mask. diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h index 8e7c8f45ab..eca32b2e20 100644 --- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h +++ b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h @@ -223,11 +223,6 @@ extern "C" { #define PPC_INTERRUPT_MAX 71 #define PPC_USE_MULTIPLE 1 -#define PPC_MSR_0 0x00009000 -#define PPC_MSR_1 0x00001000 -#define PPC_MSR_2 0x00001000 -#define PPC_MSR_3 0x00000000 - #elif defined(mpc821) /* * Added by Andrew Bray <andy@chaos.org.uk> 6/April/1999 @@ -240,11 +235,6 @@ extern "C" { #define PPC_CACHE_ALIGNMENT 16 #define PPC_INTERRUPT_MAX 71 -#define PPC_MSR_0 0x00009000 -#define PPC_MSR_1 0x00001000 -#define PPC_MSR_2 0x00001000 -#define PPC_MSR_3 0x00000000 - #elif defined(mpc750) #define CPU_MODEL_NAME "PowerPC 750" @@ -677,48 +667,6 @@ extern "C" { #endif /* - * Machine Status Register (MSR) Constants Used by RTEMS - */ - -/* - * Some PPC model manuals refer to the Exception Prefix (EP) bit as - * IP for no apparent reason. - */ - -#define PPC_MSR_RI 0x000000002 /* bit 30 - recoverable exception */ -#define PPC_MSR_DR 0x000000010 /* bit 27 - data address translation */ -#define PPC_MSR_IR 0x000000020 /* bit 26 - instruction addr translation*/ - -#if (PPC_HAS_EXCEPTION_PREFIX) -#define PPC_MSR_EP 0x000000040 /* bit 25 - exception prefix */ -#else -#define PPC_MSR_EP 0x000000000 /* bit 25 - exception prefix */ -#endif - -#if (PPC_HAS_FPU) -#define PPC_MSR_FP 0x000002000 /* bit 18 - floating point enable */ -#else -#define PPC_MSR_FP 0x000000000 /* bit 18 - floating point enable */ -#endif - -#if (PPC_LOW_POWER_MODE == PPC_LOW_POWER_MODE_NONE) -#define PPC_MSR_POW 0x000000000 /* bit 13 - power management enable */ -#else -#define PPC_MSR_POW 0x000040000 /* bit 13 - power management enable */ -#endif - -#define PPC_MSR_ME 0x000001000 /* bit 19 - machine check enable */ -#define PPC_MSR_EE 0x000008000 /* bit 16 - external interrupt enable */ - -#if (PPC_HAS_RFCI) -#define PPC_MSR_CE 0x000020000 /* bit 14 - critical interrupt enable */ -#else -#define PPC_MSR_CE 0x000000000 /* bit 14 - critical interrupt enable */ -#endif - -#define PPC_MSR_DISABLE_MASK (PPC_MSR_ME|PPC_MSR_EE|PPC_MSR_CE) - -/* * Initial value for the FPSCR register */ |