From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Fri, 15 Feb 2008 13:46:30 +0000 (+0000)
Subject: Remove references to ulCriticalNesting from the register test tasks as the variable... 
X-Git-Tag: V4.7.2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf17c194bd7bbf96261769033b6db918fca19b8a;p=freertos

Remove references to ulCriticalNesting from the register test tasks as the variable is no longer saved as part of the task context.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@192 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---

diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index 4f2e2cd4f..9ec92d97c 100644
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -164,9 +164,6 @@ static void vSecondRegisterTestTask( void *pvParameters );
 register test tasks. */
 unsigned portLONG ulRegTestError = pdFALSE;
 
-/* Variables used to ensure the register check tasks are still executing. */
-static volatile unsigned portLONG ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL;
-
 /*---------------------------------------------------------------------------*/
 
 /* Start all the demo application tasks, then start the scheduler. */
@@ -255,7 +252,6 @@ portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime;
 static portSHORT prvCheckOtherTasksAreStillRunning( void )
 {
 portBASE_TYPE lReturn = pdPASS;
-static unsigned portLONG ulLastRegTest1Counter = 0UL, ulLastRegTest2Counter = 0UL;
 
 	/* The demo tasks maintain a count that increments every cycle of the task
 	provided that the task has never encountered an error.  This function 
@@ -324,22 +320,6 @@ static unsigned portLONG ulLastRegTest1Counter = 0UL, ulLastRegTest2Counter = 0U
 		lReturn = pdFAIL;
 	}
 
-	/* Are the register test tasks still running? */
-	if( ulLastRegTest1Counter == ulRegTest1Counter )
-	{
-		lReturn = pdFAIL;
-	}
-	
-	if( ulLastRegTest2Counter == ulRegTest2Counter )
-	{
-		lReturn = pdFAIL;
-	}
-
-	/* Record the current values of the register check cycle counters so we
-	can ensure they are still running the next time this function is called. */
-	ulLastRegTest1Counter = ulRegTest1Counter;
-	ulLastRegTest2Counter = ulRegTest2Counter;
-
 	return lReturn;
 }
 /*-----------------------------------------------------------*/
@@ -408,11 +388,7 @@ extern volatile unsigned portLONG ulCriticalNesting;
 	/* Fills the registers with known values (different to the values
 	used in vSecondRegisterTestTask()), then checks that the registers still
 	all contain the expected value.  This is done to test the context save
-	and restore mechanism as this task is swapped onto and off of the CPU.
-
-	The critical nesting depth is also saved as part of the context so also
-	check this maintains an expected value. */
-	ulCriticalNesting = 0x12345678;
+	and restore mechanism as this task is swapped onto and off of the CPU. */
 
 	for( ;; )
 	{
@@ -499,13 +475,6 @@ extern volatile unsigned portLONG ulCriticalNesting;
 
 
 		#pragma endasm
-
-		ulRegTest1Counter++;
-
-		if( ulCriticalNesting != 0x12345678 )
-		{
-			ulRegTestError = pdTRUE;
-		}
 	}
 }
 /*-----------------------------------------------------------*/
@@ -517,11 +486,7 @@ extern volatile unsigned portLONG ulCriticalNesting;
 	/* Fills the registers with known values (different to the values
 	used in vFirstRegisterTestTask()), then checks that the registers still
 	all contain the expected value.  This is done to test the context save
-	and restore mechanism as this task is swapped onto and off of the CPU.
-
-	The critical nesting depth is also saved as part of the context so also
-	check this maintains an expected value. */
-	ulCriticalNesting = 0x87654321;
+	and restore mechanism as this task is swapped onto and off of the CPU. */
 
 	for( ;; )
 	{
@@ -614,13 +579,6 @@ extern volatile unsigned portLONG ulCriticalNesting;
 
 
 		#pragma endasm
-
-		ulRegTest2Counter++;
-
-		if( ulCriticalNesting != 0x87654321 )
-		{
-			ulRegTestError = pdTRUE;
-		}
 	}
 }
 /*-----------------------------------------------------------*/