Changeset 1c963169 in rtems


Ignore:
Timestamp:
Sep 2, 2011, 11:20:28 AM (10 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
1c0749b9
Parents:
36c187a0
Message:

2011-09-02 Sebastian Huber <sebastian.huber@…>

  • rtems/score/nios2-utility.h: Use the same values for defines used by Altera HAL.
Location:
cpukit/score/cpu/nios2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/nios2/ChangeLog

    r36c187a0 r1c963169  
     12011-09-02      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * rtems/score/nios2-utility.h: Use the same values for defines used by
     4        Altera HAL.
     5
    162011-09-02      Sebastian Huber <sebastian.huber@embedded-brains.de>
    27
  • cpukit/score/cpu/nios2/rtems/score/nios2-utility.h

    r36c187a0 r1c963169  
    106106
    107107/* Avoid redefines with Altera HAL */
    108 #ifndef NIOS2_MPUBASE_INDEX_MASK
    109   #define NIOS2_MPUBASE_INDEX_MASK (0x1f << NIOS2_MPUBASE_INDEX_OFFSET)
    110 #endif
     108#define NIOS2_MPUBASE_INDEX_MASK (0x0000003e)
    111109
    112110#define NIOS2_MPUBASE_D (1 << 0)
     
    115113
    116114/* Avoid redefines with Altera HAL */
    117 #ifndef NIOS2_MPUACC_MASK_MASK
    118   #define NIOS2_MPUACC_MASK_MASK (0x1ffffff << NIOS2_MPUACC_MASK_OFFSET)
    119 #endif
     115#define NIOS2_MPUACC_MASK_MASK (0x7fffffc0)
    120116
    121117#define NIOS2_MPUACC_LIMIT_OFFSET 6
    122118
    123119/* Avoid redefines with Altera HAL */
    124 #ifndef NIOS2_MPUACC_LIMIT_MASK
    125   #define NIOS2_MPUACC_LIMIT_MASK (0x3ffffff << NIOS2_MPUACC_LIMIT_OFFSET)
    126 #endif
     120#define NIOS2_MPUACC_LIMIT_MASK (0xffffffc0)
    127121
    128122#define NIOS2_MPUACC_C (1 << 5)
     
    130124
    131125/* Avoid redefines with Altera HAL */
    132 #ifndef NIOS2_MPUACC_PERM_MASK
    133   #define NIOS2_MPUACC_PERM_MASK (0x7 << NIOS2_MPUACC_PERM_OFFSET)
    134 #endif
     126#define NIOS2_MPUACC_PERM_MASK (0x0000001c)
    135127
    136128#define NIOS2_MPUACC_RD (1 << 1)
Note: See TracChangeset for help on using the changeset viewer.