<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-09-02)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/nios2/ChangeLog.diff?r1=text&tr1=1.37&r2=text&tr2=1.38&diff_format=h">M</a></td><td width='1%'>1.38</td><td width='100%'>cpukit/score/cpu/nios2/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/score/cpu/nios2/rtems/score/nios2-utility.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#000088'>+ * 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>
+
</font> * rtems/score/nios2-utility.h: Avoid redefines with Altera HAL.
Declare _Nios2_ISR_Set_level().
* nios2-context-initialize.c: Use _Nios2_ISR_Set_level().
<font color='#006600'>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
</font><font color='#997700'>@@ -105,33 +105,25 @@
</font> #define NIOS2_MPUBASE_INDEX_OFFSET 1
/* Avoid redefines with Altera HAL */
<font color='#880000'>-#ifndef NIOS2_MPUBASE_INDEX_MASK
- #define NIOS2_MPUBASE_INDEX_MASK (0x1f << NIOS2_MPUBASE_INDEX_OFFSET)
-#endif
</font><font color='#000088'>+#define NIOS2_MPUBASE_INDEX_MASK (0x0000003e)
</font>
#define NIOS2_MPUBASE_D (1 << 0)
#define NIOS2_MPUACC_MASK_OFFSET 6
/* Avoid redefines with Altera HAL */
<font color='#880000'>-#ifndef NIOS2_MPUACC_MASK_MASK
- #define NIOS2_MPUACC_MASK_MASK (0x1ffffff << NIOS2_MPUACC_MASK_OFFSET)
-#endif
</font><font color='#000088'>+#define NIOS2_MPUACC_MASK_MASK (0x7fffffc0)
</font>
#define NIOS2_MPUACC_LIMIT_OFFSET 6
/* Avoid redefines with Altera HAL */
<font color='#880000'>-#ifndef NIOS2_MPUACC_LIMIT_MASK
- #define NIOS2_MPUACC_LIMIT_MASK (0x3ffffff << NIOS2_MPUACC_LIMIT_OFFSET)
-#endif
</font><font color='#000088'>+#define NIOS2_MPUACC_LIMIT_MASK (0xffffffc0)
</font>
#define NIOS2_MPUACC_C (1 << 5)
#define NIOS2_MPUACC_PERM_OFFSET 2
/* Avoid redefines with Altera HAL */
<font color='#880000'>-#ifndef NIOS2_MPUACC_PERM_MASK
- #define NIOS2_MPUACC_PERM_MASK (0x7 << NIOS2_MPUACC_PERM_OFFSET)
-#endif
</font><font color='#000088'>+#define NIOS2_MPUACC_PERM_MASK (0x0000001c)
</font>
#define NIOS2_MPUACC_RD (1 << 1)
#define NIOS2_MPUACC_WR (1 << 0)
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>