diff options
author | Till Straumann <strauman@slac.stanford.edu> | 2008-07-16 21:52:04 +0000 |
---|---|---|
committer | Till Straumann <strauman@slac.stanford.edu> | 2008-07-16 21:52:04 +0000 |
commit | 3d28361d19a2538bdb39c1e09d56d094a8621a51 (patch) | |
tree | b0ee629b416aeb3085fb9877c0738b5cf8160842 | |
parent | 2008-07-16 Till Straumann <strauman@slac.stanford.edu> (diff) | |
download | rtems-3d28361d19a2538bdb39c1e09d56d094a8621a51.tar.bz2 |
2008-07-16 Till Straumann <strauman@slac.stanford.edu>
* score/cpu/powerpc/rtems/new-exceptions/cpu.h:
use ppc_interrupt_get_disable_mask() to determine
which bits to set/clear from _CPU_ISR_Set_level().
-rw-r--r-- | cpukit/ChangeLog | 6 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0f9d243c01..22419048d2 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2008-07-16 Till Straumann <strauman@slac.stanford.edu> + * score/cpu/powerpc/rtems/new-exceptions/cpu.h: + use ppc_interrupt_get_disable_mask() to determine + which bits to set/clear from _CPU_ISR_Set_level(). + +2008-07-16 Till Straumann <strauman@slac.stanford.edu> + * score/cpu/powerpc/rtems/powerpc/registers.h: added ppc_interrupt_get_disable_mask() inline function. diff --git a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h index 8316237207..245b6b7eec 100644 --- a/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h @@ -285,10 +285,10 @@ static inline void _CPU_ISR_Set_level( uint32_t level ) register unsigned int msr; _CPU_MSR_GET(msr); if (!(level & CPU_MODES_INTERRUPT_MASK)) { - msr |= MSR_EE; + msr |= ppc_interrupt_get_disable_mask(); } else { - msr &= ~MSR_EE; + msr &= ~ppc_interrupt_get_disable_mask(); } _CPU_MSR_SET(msr); } |