change log for rtems (2011-09-02)

[rtems-vc at rtems.org]

 *sh*:
2011-09-02	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* rtems/score/nios2-utility.h: Use the same values for defines used by
	Altera HAL.

M   1.38  cpukit/score/cpu/nios2/ChangeLog
M    1.3  cpukit/score/cpu/nios2/rtems/score/nios2-utility.h

diff -u rtems/cpukit/score/cpu/nios2/ChangeLog:1.37 rtems/cpukit/score/cpu/nios2/ChangeLog:1.38
--- rtems/cpukit/score/cpu/nios2/ChangeLog:1.37	Fri Sep  2 02:52:30 2011
+++ rtems/cpukit/score/cpu/nios2/ChangeLog	Fri Sep  2 06:20:28 2011
@@ -1,5 +1,10 @@
 2011-09-02	Sebastian Huber <sebastian.huber at 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 at 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 -u rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.2 rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.3
--- rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.2	Fri Sep  2 02:52:30 2011
+++ rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h	Fri Sep  2 06:20:28 2011
@@ -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)



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110902/4fbf665f/attachment-0001.html>