diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-14 15:24:51 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-14 15:24:51 +0000 |
| commit | b281e425ab0057ae5e2eabc026e77c0a0aac544a (patch) | |
| tree | 8ec542258f438a3fb3668d4a29452204285f421e /cpukit/score | |
| parent | Formatting. (diff) | |
| download | rtems-b281e425ab0057ae5e2eabc026e77c0a0aac544a.tar.bz2 | |
2008-08-14 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/powerpc/registers.h: Removed obsolete defines MSR_, MSR_KERNEL
and MSR_USER. Added missing prototypes.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/powerpc/rtems/powerpc/registers.h | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index c86e6c391b..53f3a3ef92 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2008-08-14 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * rtems/powerpc/registers.h: Removed obsolete defines MSR_, MSR_KERNEL + and MSR_USER. Added missing prototypes. + 2008-08-04 Sebastian Huber <sebastian.huber@embedded-brains.de> * rtems/new-exceptions/cpu.h: Changed define diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h index 04e69c5403..0729aebb50 100644 --- a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h +++ b/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h @@ -40,10 +40,6 @@ #define MSR_RI (1<<1) /* Recoverable Exception */ #define MSR_LE (1<<0) /* Little-Endian enable */ -#define MSR_ MSR_ME|MSR_RI -#define MSR_KERNEL MSR_|MSR_IR|MSR_DR -#define MSR_USER MSR_KERNEL|MSR_PR|MSR_EE - /* Bit encodings for Hardware Implementation Register (HID0) on PowerPC 603, 604, etc. processors (not 601). */ @@ -349,17 +345,19 @@ static inline void ppc_interrupt_set_disable_mask( uint32_t mask) ); } -static inline uint32_t ppc_interrupt_get_disable_mask() +static inline uint32_t ppc_interrupt_get_disable_mask( void) { -uint32_t mask; + uint32_t mask; + asm volatile ( - "mfspr %0,272" + "mfspr %0, 272" : "=r" (mask) ); + return mask; } -static inline uint32_t ppc_interrupt_disable() +static inline uint32_t ppc_interrupt_disable( void) { uint32_t level; uint32_t mask; |