<!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-02-14)</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>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-02-14 Joel Sherrill <joel.sherrilL@OARcorp.com>
* score/include/rtems/score/coremutex.h,
score/inline/rtems/score/coremutex.inl, score/src/apimutexallocate.c:
Fix direction of conditional and eliminate use of nesting is error
when POSIX is disabled.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2709&r2=text&tr2=1.2710&diff_format=h">M</a></td><td width='1%'>1.2710</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/coremutex.h.diff?r1=text&tr1=1.40&r2=text&tr2=1.41&diff_format=h">M</a></td><td width='1%'>1.41</td><td width='100%'>cpukit/score/include/rtems/score/coremutex.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/inline/rtems/score/coremutex.inl.diff?r1=text&tr1=1.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</td><td width='100%'>cpukit/score/inline/rtems/score/coremutex.inl</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/apimutexallocate.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/score/src/apimutexallocate.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2709 rtems/cpukit/ChangeLog:1.2710
--- rtems/cpukit/ChangeLog:1.2709 Fri Feb 11 14:38:16 2011
+++ rtems/cpukit/ChangeLog Mon Feb 14 11:50:22 2011
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+2011-02-14 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * score/include/rtems/score/coremutex.h,
+ score/inline/rtems/score/coremutex.inl, score/src/apimutexallocate.c:
+ Fix direction of conditional and eliminate use of nesting is error
+ when POSIX is disabled.
+
</font> 2011-02-11 Joel Sherrill <joel.sherrilL@OARcorp.com>
* rtems/src/semtranslatereturncode.c,
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/coremutex.h:1.40 rtems/cpukit/score/include/rtems/score/coremutex.h:1.41
--- rtems/cpukit/score/include/rtems/score/coremutex.h:1.40 Fri Feb 11 14:38:16 2011
+++ rtems/cpukit/score/include/rtems/score/coremutex.h Mon Feb 14 11:50:22 2011
</font><font color='#997700'>@@ -85,7 +85,7 @@
</font> * resource was unavailable.
*/
CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT,
<font color='#880000'>-#if !defined(RTEMS_POSIX_API)
</font><font color='#000088'>+#if defined(RTEMS_POSIX_API)
</font> /** This status indicates that an attempt was made to relock a mutex
* for which nesting is not configured.
*/
<font color='#997700'>@@ -142,6 +142,7 @@
</font> * + unlock(m)
*/
CORE_MUTEX_NESTING_ACQUIRES,
<font color='#000088'>+#if defined(RTEMS_POSIX_API)
</font> /**
* This sequence returns an error at the indicated point:
*
<font color='#997700'>@@ -150,6 +151,7 @@
</font> * + unlock(m)
*/
CORE_MUTEX_NESTING_IS_ERROR,
<font color='#000088'>+#endif
</font> /**
* This sequence performs as indicated:
* + lock(m)
<font color='#006600'>diff -u rtems/cpukit/score/inline/rtems/score/coremutex.inl:1.28 rtems/cpukit/score/inline/rtems/score/coremutex.inl:1.29
--- rtems/cpukit/score/inline/rtems/score/coremutex.inl:1.28 Mon Nov 9 08:52:28 2009
+++ rtems/cpukit/score/inline/rtems/score/coremutex.inl Mon Feb 14 11:50:23 2011
</font><font color='#997700'>@@ -205,10 +205,12 @@
</font> the_mutex->nest_count++;
_ISR_Enable( *level_p );
return 0;
<font color='#880000'>- case CORE_MUTEX_NESTING_IS_ERROR:
- executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
- _ISR_Enable( *level_p );
- return 0;
</font><font color='#000088'>+ #if defined(RTEMS_POSIX_API)
+ case CORE_MUTEX_NESTING_IS_ERROR:
+ executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
+ _ISR_Enable( *level_p );
+ return 0;
+ #endif
</font> case CORE_MUTEX_NESTING_BLOCKS:
break;
}
<font color='#006600'>diff -u rtems/cpukit/score/src/apimutexallocate.c:1.4 rtems/cpukit/score/src/apimutexallocate.c:1.5
--- rtems/cpukit/score/src/apimutexallocate.c:1.4 Sun Dec 21 23:52:31 2008
+++ rtems/cpukit/score/src/apimutexallocate.c Mon Feb 14 11:50:23 2011
</font><font color='#997700'>@@ -23,7 +23,7 @@
</font> API_Mutex_Control *mutex;
CORE_mutex_Attributes attr = {
<font color='#880000'>- CORE_MUTEX_NESTING_IS_ERROR,
</font><font color='#000088'>+ CORE_MUTEX_NESTING_ACQUIRES,
</font> false,
CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT,
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>