change log for rtems (2011-02-14)

[rtems-vc at rtems.org]

 *joel*:
2011-02-14	Joel Sherrill <joel.sherrilL at 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.

M 1.2710  cpukit/ChangeLog
M   1.41  cpukit/score/include/rtems/score/coremutex.h
M   1.29  cpukit/score/inline/rtems/score/coremutex.inl
M    1.5  cpukit/score/src/apimutexallocate.c

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
@@ -1,3 +1,10 @@
+2011-02-14	Joel Sherrill <joel.sherrilL at 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.
+
 2011-02-11	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* rtems/src/semtranslatereturncode.c,

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
@@ -85,7 +85,7 @@
    *  resource was unavailable.
    */
   CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT,
-#if !defined(RTEMS_POSIX_API)
+#if defined(RTEMS_POSIX_API)
   /** This status indicates that an attempt was made to relock a mutex
    *  for which nesting is not configured.
    */
@@ -142,6 +142,7 @@
    *         + unlock(m)
    */
   CORE_MUTEX_NESTING_ACQUIRES,
+#if defined(RTEMS_POSIX_API)
   /**
    *    This sequence returns an error at the indicated point:
    *
@@ -150,6 +151,7 @@
    *        + unlock(m)
    */
   CORE_MUTEX_NESTING_IS_ERROR,
+#endif
   /**
    *    This sequence performs as indicated:
    *        + lock(m)

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
@@ -205,10 +205,12 @@
         the_mutex->nest_count++;
         _ISR_Enable( *level_p );
         return 0;
-      case CORE_MUTEX_NESTING_IS_ERROR:
-        executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
-        _ISR_Enable( *level_p );
-        return 0;
+      #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
       case CORE_MUTEX_NESTING_BLOCKS:
         break;
     }

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
@@ -23,7 +23,7 @@
   API_Mutex_Control *mutex;
 
   CORE_mutex_Attributes attr =  {
-    CORE_MUTEX_NESTING_IS_ERROR,
+    CORE_MUTEX_NESTING_ACQUIRES,
     false,
     CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT,
     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/20110214/76fdef38/attachment.html>