diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-02 11:20:28 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-02 11:20:28 +0000 |
| commit | 1c963169e10c4d9aad84379b3b7d29e7826c785d (patch) | |
| tree | 8ca8f5ebe4d030971a599b50a9dde13d9a1a6713 /cpukit/score/cpu/nios2 | |
| parent | 2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-1c963169e10c4d9aad84379b3b7d29e7826c785d.tar.bz2 | |
2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/nios2-utility.h: Use the same values for defines used by
Altera HAL.
Diffstat (limited to 'cpukit/score/cpu/nios2')
| -rw-r--r-- | cpukit/score/cpu/nios2/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/nios2/rtems/score/nios2-utility.h | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/cpukit/score/cpu/nios2/ChangeLog b/cpukit/score/cpu/nios2/ChangeLog index 6c7497d4f6..bcba632ca5 100644 --- a/cpukit/score/cpu/nios2/ChangeLog +++ b/cpukit/score/cpu/nios2/ChangeLog @@ -1,5 +1,10 @@ 2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de> + * rtems/score/nios2-utility.h: Use the same values for defines used by + Altera HAL. + +2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de> + * rtems/score/nios2-utility.h: Avoid redefines with Altera HAL. Declare _Nios2_ISR_Set_level(). * nios2-context-initialize.c: Use _Nios2_ISR_Set_level(). diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h index 97a609f3f1..d49d90377d 100644 --- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h +++ b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h @@ -105,33 +105,25 @@ #define NIOS2_MPUBASE_INDEX_OFFSET 1 /* Avoid redefines with Altera HAL */ -#ifndef NIOS2_MPUBASE_INDEX_MASK - #define NIOS2_MPUBASE_INDEX_MASK (0x1f << NIOS2_MPUBASE_INDEX_OFFSET) -#endif +#define NIOS2_MPUBASE_INDEX_MASK (0x0000003e) #define NIOS2_MPUBASE_D (1 << 0) #define NIOS2_MPUACC_MASK_OFFSET 6 /* Avoid redefines with Altera HAL */ -#ifndef NIOS2_MPUACC_MASK_MASK - #define NIOS2_MPUACC_MASK_MASK (0x1ffffff << NIOS2_MPUACC_MASK_OFFSET) -#endif +#define NIOS2_MPUACC_MASK_MASK (0x7fffffc0) #define NIOS2_MPUACC_LIMIT_OFFSET 6 /* Avoid redefines with Altera HAL */ -#ifndef NIOS2_MPUACC_LIMIT_MASK - #define NIOS2_MPUACC_LIMIT_MASK (0x3ffffff << NIOS2_MPUACC_LIMIT_OFFSET) -#endif +#define NIOS2_MPUACC_LIMIT_MASK (0xffffffc0) #define NIOS2_MPUACC_C (1 << 5) #define NIOS2_MPUACC_PERM_OFFSET 2 /* Avoid redefines with Altera HAL */ -#ifndef NIOS2_MPUACC_PERM_MASK - #define NIOS2_MPUACC_PERM_MASK (0x7 << NIOS2_MPUACC_PERM_OFFSET) -#endif +#define NIOS2_MPUACC_PERM_MASK (0x0000001c) #define NIOS2_MPUACC_RD (1 << 1) #define NIOS2_MPUACC_WR (1 << 0) |