From 390dadd2c5b01ced6a2b0897404ccae254c5e4ec Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 30 Jun 2010 07:43:00 +0000 Subject: [PATCH] 2010-06-30 Peter Dufault PR 1588/cpukit * rtems/powerpc/registers.h: Renamed defines SR0 .. SR15 in PPC_SR0 .. PPC_SR15. --- cpukit/score/cpu/powerpc/ChangeLog | 6 ++++ .../cpu/powerpc/rtems/powerpc/registers.h | 32 +++++++++---------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 9190509b92..36e1177293 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2010-06-30 Peter Dufault + + PR 1588/cpukit + * rtems/powerpc/registers.h: Renamed defines SR0 .. SR15 in + PPC_SR0 .. PPC_SR15. + 2010-06-28 Joel Sherrill PR 1573/cpukit diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h index 841ac50b17..4f3d1870dc 100644 --- a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h +++ b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h @@ -271,22 +271,22 @@ lidate */ #define THRM3_E (1<<(31-31)) /* Segment Registers */ -#define SR0 0 -#define SR1 1 -#define SR2 2 -#define SR3 3 -#define SR4 4 -#define SR5 5 -#define SR6 6 -#define SR7 7 -#define SR8 8 -#define SR9 9 -#define SR10 10 -#define SR11 11 -#define SR12 12 -#define SR13 13 -#define SR14 14 -#define SR15 15 +#define PPC_SR0 0 +#define PPC_SR1 1 +#define PPC_SR2 2 +#define PPC_SR3 3 +#define PPC_SR4 4 +#define PPC_SR5 5 +#define PPC_SR6 6 +#define PPC_SR7 7 +#define PPC_SR8 8 +#define PPC_SR9 9 +#define PPC_SR10 10 +#define PPC_SR11 11 +#define PPC_SR12 12 +#define PPC_SR13 13 +#define PPC_SR14 14 +#define PPC_SR15 15 #define BOOKE_DECAR 54