<!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: Avoid redefines with Altera HAL.
Declare _Nios2_ISR_Set_level().
* nios2-context-initialize.c: Use _Nios2_ISR_Set_level().
* nios2-isr-set-level.c: Define _Nios2_ISR_Set_level().
</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.36&r2=text&tr2=1.37&diff_format=h">M</a></td><td width='1%'>1.37</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/nios2-context-initialize.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/cpu/nios2/nios2-context-initialize.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>cpukit/score/cpu/nios2/nios2-isr-set-level.c</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.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</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.36 rtems/cpukit/score/cpu/nios2/ChangeLog:1.37
--- rtems/cpukit/score/cpu/nios2/ChangeLog:1.36 Thu Sep 1 10:52:12 2011
+++ rtems/cpukit/score/cpu/nios2/ChangeLog Fri Sep 2 02:52:30 2011
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+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().
+ * nios2-isr-set-level.c: Define _Nios2_ISR_Set_level().
+
</font> 2011-09-01 Sebastian Huber <sebastian.huber@embedded-brains.de>
* cpu.c, cpu_asm.S: Removed files.
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/nios2-context-initialize.c:1.1 rtems/cpukit/score/cpu/nios2/nios2-context-initialize.c:1.2
--- rtems/cpukit/score/cpu/nios2/nios2-context-initialize.c:1.1 Thu Sep 1 10:52:12 2011
+++ rtems/cpukit/score/cpu/nios2/nios2-context-initialize.c Fri Sep 2 02:52:30 2011
</font><font color='#997700'>@@ -17,9 +17,11 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <rtems/score/cpu.h>
</font> #include <string.h>
<font color='#000088'>+#include <rtems/score/cpu.h>
+#include <rtems/score/nios2-utility.h>
+
</font> void _CPU_Context_Initialize(
Context_Control *context,
void *stack_area_begin,
<font color='#997700'>@@ -34,8 +36,7 @@
</font> memset(context, 0, sizeof(*context));
context->fp = stack;
<font color='#000088'>+ context->status = _Nios2_ISR_Set_level( new_level, NIOS2_STATUS_PIE );
</font> context->sp = stack;
context->ra = (uint32_t) entry_point;
<font color='#880000'>- /* @todo Add EIC support. */
- context->status = new_level ? 0 : 1;
</font> }
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.1 rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.2
--- rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.1 Thu Sep 1 10:52:12 2011
+++ rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c Fri Sep 2 02:52:30 2011
</font><font color='#997700'>@@ -21,10 +21,8 @@
</font> #include <rtems/score/interr.h>
#include <rtems/score/nios2-utility.h>
<font color='#880000'>-void _CPU_ISR_Set_level( uint32_t new_level )
</font><font color='#000088'>+uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status )
</font> {
<font color='#880000'>- uint32_t status = _Nios2_Get_ctlreg_status();
-
</font> switch ( _Nios2_Get_ISR_status_mask() ) {
case NIOS2_ISR_STATUS_MASK_IIC:
if ( new_level == 0 ) {
<font color='#997700'>@@ -50,5 +48,14 @@
</font> break;
}
<font color='#000088'>+ return status;
+}
+
+void _CPU_ISR_Set_level( uint32_t new_level )
+{
+ uint32_t status = _Nios2_Get_ctlreg_status();
+
+ status = _Nios2_ISR_Set_level( new_level, status );
+
</font> _Nios2_Set_ctlreg_status( status );
}
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.1 rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.2
--- rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.1 Thu Sep 1 10:52:12 2011
+++ rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h Fri Sep 2 02:52:30 2011
</font><font color='#997700'>@@ -103,16 +103,36 @@
</font> #define NIOS2_MPUBASE_BASE_OFFSET 5
#define NIOS2_MPUBASE_BASE_MASK (0x1ffffff << NIOS2_MPUBASE_BASE_OFFSET)
#define NIOS2_MPUBASE_INDEX_OFFSET 1
<font color='#880000'>-#define NIOS2_MPUBASE_INDEX_MASK (0x1f << NIOS2_MPUBASE_INDEX_OFFSET)
</font><font color='#000088'>+
+/* Avoid redefines with Altera HAL */
+#ifndef NIOS2_MPUBASE_INDEX_MASK
+ #define NIOS2_MPUBASE_INDEX_MASK (0x1f << NIOS2_MPUBASE_INDEX_OFFSET)
+#endif
+
</font> #define NIOS2_MPUBASE_D (1 << 0)
#define NIOS2_MPUACC_MASK_OFFSET 6
<font color='#880000'>-#define NIOS2_MPUACC_MASK_MASK (0x1ffffff << NIOS2_MPUACC_MASK_OFFSET)
</font><font color='#000088'>+
+/* Avoid redefines with Altera HAL */
+#ifndef NIOS2_MPUACC_MASK_MASK
+ #define NIOS2_MPUACC_MASK_MASK (0x1ffffff << NIOS2_MPUACC_MASK_OFFSET)
+#endif
+
</font> #define NIOS2_MPUACC_LIMIT_OFFSET 6
<font color='#880000'>-#define NIOS2_MPUACC_LIMIT_MASK (0x3ffffff << NIOS2_MPUACC_LIMIT_OFFSET)
</font><font color='#000088'>+
+/* Avoid redefines with Altera HAL */
+#ifndef NIOS2_MPUACC_LIMIT_MASK
+ #define NIOS2_MPUACC_LIMIT_MASK (0x3ffffff << NIOS2_MPUACC_LIMIT_OFFSET)
+#endif
+
</font> #define NIOS2_MPUACC_C (1 << 5)
#define NIOS2_MPUACC_PERM_OFFSET 2
<font color='#880000'>-#define NIOS2_MPUACC_PERM_MASK (0x7 << NIOS2_MPUACC_PERM_OFFSET)
</font><font color='#000088'>+
+/* Avoid redefines with Altera HAL */
+#ifndef NIOS2_MPUACC_PERM_MASK
+ #define NIOS2_MPUACC_PERM_MASK (0x7 << NIOS2_MPUACC_PERM_OFFSET)
+#endif
+
</font> #define NIOS2_MPUACC_RD (1 << 1)
#define NIOS2_MPUACC_WR (1 << 0)
<font color='#997700'>@@ -286,11 +306,11 @@
</font>
static inline bool _Nios2_Has_internal_interrupt_controller( void )
{
<font color='#880000'>- uint32_t isr_status_mask = _Nios2_Get_ISR_status_mask();
-
- return isr_status_mask == NIOS2_ISR_STATUS_MASK_IIC;
</font><font color='#000088'>+ return _Nios2_Get_ISR_status_mask() == NIOS2_ISR_STATUS_MASK_IIC;
</font> }
<font color='#000088'>+uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status );
+
</font> #ifdef __cplusplus
}
#endif /* __cplusplus */
</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>