<!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, nios2-isr-set-level.c,
nios2-isr-get-level.c: Renamed functions.
</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.38&r2=text&tr2=1.39&diff_format=h">M</a></td><td width='1%'>1.39</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-isr-get-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-get-level.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.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/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.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</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.38 rtems/cpukit/score/cpu/nios2/ChangeLog:1.39
--- rtems/cpukit/score/cpu/nios2/ChangeLog:1.38 Fri Sep 2 06:20:28 2011
+++ rtems/cpukit/score/cpu/nios2/ChangeLog Fri Sep 2 10:06:00 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, nios2-isr-set-level.c,
+ nios2-isr-get-level.c: Renamed functions.
+
+2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
</font> * rtems/score/nios2-utility.h: Use the same values for defines used by
Altera HAL.
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/nios2-isr-get-level.c:1.1 rtems/cpukit/score/cpu/nios2/nios2-isr-get-level.c:1.2
--- rtems/cpukit/score/cpu/nios2/nios2-isr-get-level.c:1.1 Thu Sep 1 10:52:12 2011
+++ rtems/cpukit/score/cpu/nios2/nios2-isr-get-level.c Fri Sep 2 10:06:00 2011
</font><font color='#997700'>@@ -26,7 +26,7 @@
</font> uint32_t status = _Nios2_Get_ctlreg_status();
uint32_t level = 0;
<font color='#880000'>- switch ( _Nios2_Get_ISR_status_mask() ) {
</font><font color='#000088'>+ switch ( _Nios2_ISR_Get_status_mask() ) {
</font> case NIOS2_ISR_STATUS_MASK_IIC:
level = (status & NIOS2_STATUS_PIE) == 0;
break;
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.2 rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.3
--- rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c:1.2 Fri Sep 2 02:52:30 2011
+++ rtems/cpukit/score/cpu/nios2/nios2-isr-set-level.c Fri Sep 2 10:06:00 2011
</font><font color='#997700'>@@ -23,7 +23,7 @@
</font>
uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status )
{
<font color='#880000'>- switch ( _Nios2_Get_ISR_status_mask() ) {
</font><font color='#000088'>+ switch ( _Nios2_ISR_Get_status_mask() ) {
</font> case NIOS2_ISR_STATUS_MASK_IIC:
if ( new_level == 0 ) {
status |= NIOS2_STATUS_PIE;
<font color='#006600'>diff -u rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.3 rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.4
--- rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h:1.3 Fri Sep 2 06:20:28 2011
+++ rtems/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h Fri Sep 2 10:06:00 2011
</font><font color='#997700'>@@ -286,19 +286,19 @@
</font> __builtin_wrctl( NIOS2_CTLREG_INDEX_MPUACC, (int) value );
}
<font color='#880000'>-static inline uint32_t _Nios2_Get_ISR_status_mask( void )
</font><font color='#000088'>+static inline uint32_t _Nios2_ISR_Get_status_mask( void )
</font> {
return (uint32_t) &_Nios2_ISR_Status_mask [0];
}
<font color='#880000'>-static inline uint32_t _Nios2_Get_ISR_status_bits( void )
</font><font color='#000088'>+static inline uint32_t _Nios2_ISR_Get_status_bits( void )
</font> {
return (uint32_t) &_Nios2_ISR_Status_bits [0];
}
static inline bool _Nios2_Has_internal_interrupt_controller( void )
{
<font color='#880000'>- return _Nios2_Get_ISR_status_mask() == NIOS2_ISR_STATUS_MASK_IIC;
</font><font color='#000088'>+ return _Nios2_ISR_Get_status_mask() == NIOS2_ISR_STATUS_MASK_IIC;
</font> }
uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status );
</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>