From d3fcd2b0ecd43cf38f1897fc62fba2a8b5bec50e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 13 Feb 2005 07:33:35 +0000 Subject: 2005-02-13 Ralf Corsepius * 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. --- cpukit/score/cpu/powerpc/ChangeLog | 6 ++++++ cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'cpukit/score/cpu/powerpc') diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 4ecfb3ba4a..2b1018ab2b 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2005-02-13 Ralf Corsepius + + * 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. + 2005-02-12 Ralf Corsepius * cpu.c: New (Stub file for consistency with other ports). diff --git a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h index cdcb76df1c..fbc303ab23 100644 --- a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h @@ -683,6 +683,8 @@ void _CPU_Initialize_vectors(void); */ #ifndef ASM +extern const unsigned int _PPC_MSR_DISABLE_MASK; + #define _CPU_MSR_Value( _msr_value ) \ do { \ _msr_value = 0; \ @@ -694,7 +696,7 @@ void _CPU_Initialize_vectors(void); #if 0 #define _CPU_ISR_Disable( _isr_cookie ) \ - { register unsigned int _disable_mask = PPC_MSR_DISABLE_MASK; \ + { register unsigned int _disable_mask = _PPC_MSR_DISABLE_MASK; \ _isr_cookie = 0; \ asm volatile ( "mfmsr %0" : \ @@ -715,7 +717,7 @@ void _CPU_Initialize_vectors(void); #endif #define _CPU_ISR_Disable( _isr_cookie ) \ - { register unsigned int _disable_mask = PPC_MSR_DISABLE_MASK; \ + { register unsigned int _disable_mask = _PPC_MSR_DISABLE_MASK; \ _isr_cookie = 0; \ asm volatile ( \ "mfmsr %0; andc %1,%0,%1; mtmsr %1" : \ @@ -753,7 +755,7 @@ void _CPU_Initialize_vectors(void); #ifndef ASM #define _CPU_ISR_Flash( _isr_cookie ) \ - { register unsigned int _disable_mask = PPC_MSR_DISABLE_MASK; \ + { register unsigned int _disable_mask = _PPC_MSR_DISABLE_MASK; \ asm volatile ( \ "mtmsr %0; andc %1,%0,%1; mtmsr %1" : \ "=r" ((_isr_cookie)), "=r" ((_disable_mask)) : \ -- cgit v1.2.3