Backup NEC project - still a work in progress.

git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@617 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 files changed, 167 insertions, 114 deletions

diff --git a/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h b/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h
index b00f5b5f..dc833811 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h
@@ -19,7 +19,7 @@
 

 	A special exception to the GPL can be applied should you wish to distribute

 	a combined work that includes FreeRTOS.org, without being obliged to provide

-	the source code for any proprietary components.  See the licensing section 

+	the source code for any proprietary components.  See the licensing section

 	of http://www.FreeRTOS.org for full details of how and when the exception

 	can be applied.

 

@@ -37,13 +37,13 @@
 	Please ensure to read the configuration and relevant port sections of the

 	online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and 

+	http://www.FreeRTOS.org - Documentation, latest information, license and

 	contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety 

+	http://www.SafeRTOS.com - A version that is certified for use in safety

 	critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting, 

+	http://www.OpenRTOS.com - Commercial support, development, porting,

 	licensing and training services.

 */

 

@@ -81,31 +81,37 @@
 /* only include in C files */

 #ifdef __IAR_SYSTEMS_ICC__

 

-#define configUSE_IDLE_HOOK		0

-#define configUSE_TICK_HOOK		0

-#define configCPU_CLOCK_HZ		( ( unsigned portLONG ) 48000000 )  /* using the external clock source */

-#define configTICK_RATE_HZ		( ( portTickType ) 1000 )

-#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 64 )

-#define configTOTAL_HEAP_SIZE		( (size_t ) ( 9000 ) )

-#define configMAX_TASK_NAME_LEN		( 10 )

-#define configUSE_TRACE_FACILITY	0

-#define configUSE_16_BIT_TICKS		0

-#define configIDLE_SHOULD_YIELD		1

+#define configUSE_IDLE_HOOK				0

+#define configUSE_TICK_HOOK				0

+#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 48000000 )  /* using the external clock source */

+#define configTICK_RATE_HZ				( ( portTickType ) 1000 )

+#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 4 )

+#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 64 )

+#define configTOTAL_HEAP_SIZE			( (size_t ) ( 20000 ) )

+#define configMAX_TASK_NAME_LEN			( 10 )

+#define configUSE_TRACE_FACILITY		0

+#define configUSE_16_BIT_TICKS			0

+#define configIDLE_SHOULD_YIELD			0

+#define configUSE_CO_ROUTINES 			0

+#define configUSE_MUTEXES				1

+#define configCHECK_FOR_STACK_OVERFLOW	2

+#define configUSE_RECURSIVE_MUTEXES		1

+#define configQUEUE_REGISTRY_SIZE		0

+#define configUSE_COUNTING_SEMAPHORES	0

 

 /* Co-routine definitions. */

-#define configUSE_CO_ROUTINES 		0

+#define configUSE_CO_ROUTINES 			0

 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )

 

 /* Set the following definitions to 1 to include the API function, or zero

 to exclude the API function. */

-#define INCLUDE_vTaskPrioritySet		0

-#define INCLUDE_uxTaskPriorityGet		0

-#define INCLUDE_vTaskDelete			1

-#define INCLUDE_vTaskCleanUpResources	        0

-#define INCLUDE_vTaskSuspend			0

+#define INCLUDE_vTaskPrioritySet		1

+#define INCLUDE_uxTaskPriorityGet		1

+#define INCLUDE_vTaskDelete				1

+#define INCLUDE_vTaskCleanUpResources	0

+#define INCLUDE_vTaskSuspend			1

 #define INCLUDE_vTaskDelayUntil			1

-#define INCLUDE_vTaskDelay			1

+#define INCLUDE_vTaskDelay				1

 

 #endif /* __IAR_SYSTEMS_ICC__ */

 

diff --git a/Demo/NEC_V850ES_Fx3_IAR/main.c b/Demo/NEC_V850ES_Fx3_IAR/main.c
index 2c401980..9777f886 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/main.c
+++ b/Demo/NEC_V850ES_Fx3_IAR/main.c
@@ -19,7 +19,7 @@
 

 	A special exception to the GPL can be applied should you wish to distribute

 	a combined work that includes FreeRTOS.org, without being obliged to provide

-	the source code for any proprietary components.  See the licensing section 

+	the source code for any proprietary components.  See the licensing section

 	of http://www.FreeRTOS.org for full details of how and when the exception

 	can be applied.

 

@@ -37,13 +37,13 @@
 	Please ensure to read the configuration and relevant port sections of the

 	online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and 

+	http://www.FreeRTOS.org - Documentation, latest information, license and

 	contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety 

+	http://www.SafeRTOS.com - A version that is certified for use in safety

 	critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting, 

+	http://www.OpenRTOS.com - Commercial support, development, porting,

 	licensing and training services.

 */

 

@@ -56,68 +56,82 @@
 

 /* Demo file headers. */

 #include <intrinsics.h>

-#include "PollQ.h"

-#include "semtest.h"

-#include "print.h"

+#include "BlockQ.h"

+#include "death.h"

+#include "flash.h"

+#include "partest.h"

 #include "semtest.h"

-#include "led.h"

-#include "integer.h"

+#include "PollQ.h"

+#include "GenQTest.h"

+#include "QPeek.h"

+#include "recmutex.h"

 

 /*

  * Priority definitions for most of the tasks in the demo application.  Some

  * tasks just use the idle priority.

  */

-#define mainCHECK_TASK_PRIORITY	( tskIDLE_PRIORITY + 2 )

-#define mainQUEUE_POLL_PRIORITY	( tskIDLE_PRIORITY + 1 )

-#define mainSEMTEST_PRIORITY    ( tskIDLE_PRIORITY + 1 )

-#define mainLED_TOGGLE_PRIORITY ( tskIDLE_PRIORITY + 1 )

+#define mainFLASH_PRIORITY					( tskIDLE_PRIORITY + 1 )

+#define mainQUEUE_POLL_PRIORITY				( tskIDLE_PRIORITY + 2 )

+#define mainCHECK_TASK_PRIORITY				( tskIDLE_PRIORITY + 3 )

+#define mainSEM_TEST_PRIORITY				( tskIDLE_PRIORITY + 1 )

+#define mainBLOCK_Q_PRIORITY				( tskIDLE_PRIORITY + 2 )

+#define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 2 )

+#define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY )

+#define mainGEN_QUEUE_TASK_PRIORITY			( tskIDLE_PRIORITY )

 

 /* The period between executions of the check task. */

-#define mainCHECK_PERIOD	( ( portTickType ) 3000 / portTICK_RATE_MS  )

+#define mainNO_ERROR_DELAY		( ( portTickType ) 3000 / portTICK_RATE_MS  )

+#define mainERROR_DELAY			( ( portTickType ) 500 / portTICK_RATE_MS )

 

-/* The task function for the "Check" task. */

-static void vErrorChecks( void *pvParameters );

+#define mainCHECK_TASK_LED		( 3 )

 

-/*

- * Checks the unique counts of other tasks to ensure they are still operational.

- * Flashes an LED if everything is okay.

- */

-static long prvCheckOtherTasksAreStillRunning( void );

+/* The task function for the "Check" task. */

+static void prvCheckTask( void *pvParameters );

 

 /* low level initialization prototype */

 unsigned portCHAR __low_level_init(void);

 

+static void prvSetupHardware( void );

+

 extern void vRegTest1( void *pvParameters );

 extern void vRegTest2( void *pvParameters );

 

 /*-----------------------------------------------------------*/

 

-volatile portLONG lRegTestStatus = pdPASS;

+static volatile portLONG lRegTestStatus = pdPASS;

 

 void vRegTestFailed( void )

 {

 	lRegTestStatus = pdFAIL;

+	

+	/* Do not return from here as the reg test tasks clobber all registers so

+	function calls may not function correctly. */

 	for( ;; );

 }

 

 void main( void )

 {

-	/* Create some standard demo tasks. */

-//	vStartIntegerMathTasks( tskIDLE_PRIORITY );

-//	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );

-//	vStartSemaphoreTasks(mainSEMTEST_PRIORITY);

-

-	/* Create a simple task that toggles a pin. */

-//	vStartLEDToggleTasks( mainLED_TOGGLE_PRIORITY );

+	prvSetupHardware();

+	

+	vStartLEDFlashTasks( mainFLASH_PRIORITY );

+	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );

+	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );

+	vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY );

+	vStartQueuePeekTasks();

+	vStartRecursiveMutexTasks();

+	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );

 

 	/* Create the tasks defined within this file. */

-//	xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );

-

-//	vPrintInitialise();

+	xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );

 

-xTaskCreate( vRegTest1, "Check", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

-xTaskCreate( vRegTest2, "Check", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vRegTest1, "Check", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vRegTest2, "Check", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

 

+	/* The suicide tasks must be created last as they need to know how many

+	tasks were running prior to their creation in order to ascertain whether

+	or not the correct/expected number of tasks are running at any given time. */

+    vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );

+	

 	/* Start the scheduler. */

 	vTaskStartScheduler();

 

@@ -127,56 +141,63 @@ xTaskCreate( vRegTest2, "Check", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORIT
 }

 /*-----------------------------------------------------------*/

 

-static void vErrorChecks( void *pvParameters )

+static void prvCheckTask( void *pvParameters )

 {

-volatile long lError = pdFALSE;

+portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;

 

 	/* Just to remove the compiler warning. */

 	( void ) pvParameters;

 

+	xLastWakeTime = xTaskGetTickCount();

+	

 	/* Cycle for ever, delaying then checking all the other tasks are still

 	operating without error. */

 	for( ;; )

 	{

-		/* Delay until it is time to check the other tasks again. */

-		vTaskDelay( mainCHECK_PERIOD );

+		vTaskDelayUntil( &xLastWakeTime, xDelayPeriod );

+		

+		if( lRegTestStatus != pdPASS )

+		{

+			xDelayPeriod = mainERROR_DELAY;

+		}

+		

+		if( xAreGenericQueueTasksStillRunning() != pdTRUE )

+		{

+			xDelayPeriod = mainERROR_DELAY;

+		}

 

-		if( prvCheckOtherTasksAreStillRunning() != pdPASS )

+		if( xAreQueuePeekTasksStillRunning() != pdTRUE )

 		{

-			lError = pdTRUE;

-			

-			/* Do something to indicate the error. */

-			( void ) lError;

+			xDelayPeriod = mainERROR_DELAY;

 		}

-	}

-}

-/*-----------------------------------------------------------*/

 

-static long prvCheckOtherTasksAreStillRunning( void )

-{

-long lStatus = pdPASS;

+		if( xAreBlockingQueuesStillRunning() != pdTRUE )

+		{

+			xDelayPeriod = mainERROR_DELAY;

+		}

 

-	if( xAreIntegerMathsTaskStillRunning() != pdPASS )

-	{

-		lStatus = pdFAIL;

-	}

+		if( xAreSemaphoreTasksStillRunning() != pdTRUE )

+	    {

+	    	xDelayPeriod = mainERROR_DELAY;

+	    }

 

-	if( xArePollingQueuesStillRunning() != pdPASS )

-	{

-		lStatus = pdFAIL;

-	}

+		if( xArePollingQueuesStillRunning() != pdTRUE )

+	    {

+	    	xDelayPeriod = mainERROR_DELAY;

+	    }

 

-	if( xAreSemaphoreTasksStillRunning() != pdPASS )

-	{

-		lStatus = pdFAIL;

-	}

+		if( xIsCreateTaskStillRunning() != pdTRUE )

+	    {

+	    	xDelayPeriod = mainERROR_DELAY;

+	    }

 

-	if( xAreLEDToggleTaskStillRunning() != pdPASS )

-	{

-		lStatus = pdFAIL;

-	}

+		if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )

+	    {

+	    	xDelayPeriod = mainERROR_DELAY;

+	    }

 

-	return lStatus;

+		vParTestToggleLED( mainCHECK_TASK_LED );

+	}

 }

 /*-----------------------------------------------------------*/

 

@@ -250,4 +271,15 @@ unsigned portCHAR psval = 0;
 	return pdTRUE;

 }

 

+static void prvSetupHardware( void )

+{

+	vParTestInitialise();

+}

+

+void vApplicationStackOverflowHook( void )

+{

+	for( ;; );

+}

+

+

 

diff --git a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
index 0a25cc74..6a6dc84d 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
+++ b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
@@ -1645,32 +1645,47 @@
   </configuration>

   <group>

     <name>demo source</name>

-    <file>

-      <name>$PROJ_DIR$\..\Common\Full\integer.c</name>

-    </file>

-    <file>

-      <name>$PROJ_DIR$\LEDtoggle\LED.c</name>

-    </file>

+    <group>

+      <name>Standard Demo Tasks</name>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\BlockQ.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\death.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\flash.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\GenQTest.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\PollQ.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\QPeek.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\recmutex.c</name>

+      </file>

+      <file>

+        <name>$PROJ_DIR$\..\Common\Minimal\semtest.c</name>

+      </file>

+    </group>

     <file>

       <name>$PROJ_DIR$\main.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\Common\Full\PollQ.c</name>

-    </file>

-    <file>

-      <name>$PROJ_DIR$\..\Common\Full\print.c</name>

+      <name>$PROJ_DIR$\ParTest\ParTest.c</name>

     </file>

     <file>

       <name>$PROJ_DIR$\RegTest.s85</name>

     </file>

-    <file>

-      <name>$PROJ_DIR$\..\semtest.c</name>

-    </file>

   </group>

   <group>

     <name>kernel source</name>

     <file>

-      <name>$PROJ_DIR$\..\..\Source\portable\MemMang\heap_1.c</name>

+      <name>$PROJ_DIR$\..\..\Source\portable\MemMang\heap_2.c</name>

     </file>

     <file>

       <name>$PROJ_DIR$\..\..\Source\list.c</name>

@@ -1679,7 +1694,7 @@
       <name>$PROJ_DIR$\..\..\Source\portable\IAR\V850ES_Fx3\port.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\Source\portable\IAR\V850ES_Fx3\portmacro.s85</name>

+      <name>$PROJ_DIR$\..\..\Source\portable\IAR\V850ES_Fx3\portasm.s85</name>

     </file>

     <file>

       <name>$PROJ_DIR$\..\..\Source\queue.c</name>

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
index f09c8a51..5dc53175 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
@@ -22,12 +22,12 @@
         

         

       <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow></Disassembly>

-    <Register/></Static>

+    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register></Static>

     <Windows>

       

       

       

-    <Wnd0>

+    <Wnd1>

         <Tabs>

           <Tab>

             <Identity>TabID-757-1323</Identity>

@@ -43,7 +43,7 @@
           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd0><Wnd2>

+      <SelectedTab>0</SelectedTab></Wnd1><Wnd4>

         <Tabs>

           <Tab>

             <Identity>TabID-11505-1326</Identity>

@@ -55,20 +55,20 @@
           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-24251-8685</Identity><TabName>Register</TabName><Factory>Register</Factory><Session><REG1>0</REG1><REG2>0</REG2><Group>0</Group><States>0</States></Session></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>

+      <SelectedTab>0</SelectedTab></Wnd4></Windows>

     <Editor>

       

       

       

       

-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1450</YPos><SelStart>46490</SelStart><SelEnd>46508</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>22</YPos><SelStart>1490</SelStart><SelEnd>1540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\portable\IAR\V850ES_Fx3\portmacro.s85</Filename><XPos>0</XPos><YPos>136</YPos><SelStart>8722</SelStart><SelEnd>8740</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\semtest.c</Filename><XPos>0</XPos><YPos>182</YPos><SelStart>9520</SelStart><SelEnd>9520</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c</Filename><XPos>0</XPos><YPos>90</YPos><SelStart>4505</SelStart><SelEnd>4505</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>86</YPos><SelStart>3718</SelStart><SelEnd>3718</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\Common\Full\integer.c</Filename><XPos>0</XPos><YPos>326</YPos><SelStart>8020</SelStart><SelEnd>8043</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>51</YPos><SelStart>2675</SelStart><SelEnd>2675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>163</YPos><SelStart>4999</SelStart><SelEnd>4999</SelEnd></Tab><ActiveTab>8</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>92</YPos><SelStart>4131</SelStart><SelEnd>4131</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>3127</SelStart><SelEnd>3127</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c</Filename><XPos>0</XPos><YPos>95</YPos><SelStart>10104</SelStart><SelEnd>10104</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h</Filename><XPos>0</XPos><YPos>1823</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>3471</SelStart><SelEnd>3532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>4259</SelStart><SelEnd>4259</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>4050</SelStart><SelEnd>4050</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

     <Positions>

       

       

       

       

       

-    <Top><Row0><Sizes><Toolbar-00aa9b50><key>iaridepm.enu1</key></Toolbar-00aa9b50><Toolbar-039ba368><key>debuggergui.enu1</key></Toolbar-039ba368></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>490</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>292857</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>286</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>171429</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd3></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

+    <Top><Row0><Sizes><Toolbar-00aa9938><key>iaridepm.enu1</key></Toolbar-00aa9938><Toolbar-03f8b010><key>debuggergui.enu1</key></Toolbar-03f8b010></Sizes></Row0></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>490</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>292857</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

   </Desktop>

 </Project>

 

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
index a1eb0546..c4419a24 100644
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
@@ -17,7 +17,7 @@
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build><Debug-Log/><TerminalIO/></Static>

     <Windows>

       

-    <Wnd2>

+    <Wnd0>

         <Tabs>

           <Tab>

             <Identity>TabID-30435-11592</Identity>

@@ -25,24 +25,24 @@
             <Factory>Workspace</Factory>

             <Session>

               

-            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/demo source</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode></NodeDict></Session>

+            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/demo source</ExpandedNode><ExpandedNode>rtosdemo/demo source/Standard Demo Tasks</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode></NodeDict></Session>

           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-2785-875</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-21438-1140</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-21061-4073</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>

+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-2785-875</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-21438-1140</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-21061-4073</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>

     <Editor>

       

       

       

       

-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\tasks.c</Filename><XPos>0</XPos><YPos>1450</YPos><SelStart>46490</SelStart><SelEnd>46508</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>22</YPos><SelStart>1490</SelStart><SelEnd>1540</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Source\portable\IAR\V850ES_Fx3\portmacro.s85</Filename><XPos>0</XPos><YPos>136</YPos><SelStart>8722</SelStart><SelEnd>8740</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\semtest.c</Filename><XPos>0</XPos><YPos>182</YPos><SelStart>9520</SelStart><SelEnd>9520</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c</Filename><XPos>0</XPos><YPos>90</YPos><SelStart>4505</SelStart><SelEnd>4505</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>86</YPos><SelStart>3718</SelStart><SelEnd>3718</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\Common\Full\integer.c</Filename><XPos>0</XPos><YPos>326</YPos><SelStart>8020</SelStart><SelEnd>8043</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>51</YPos><SelStart>2675</SelStart><SelEnd>2675</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\NEC\FreeRTOS V850\FreeRTOS_V850ESFx3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>163</YPos><SelStart>4999</SelStart><SelEnd>4999</SelEnd></Tab><ActiveTab>8</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>92</YPos><SelStart>4131</SelStart><SelEnd>4131</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>3127</SelStart><SelEnd>3127</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\LEDtoggle\LED.c</Filename><XPos>0</XPos><YPos>95</YPos><SelStart>10104</SelStart><SelEnd>10104</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\lib\dl85esnn.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\inc\io70f3385.h</Filename><XPos>0</XPos><YPos>1823</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>3471</SelStart><SelEnd>3532</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>4259</SelStart><SelEnd>4259</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\PollQ.c</Filename><XPos>0</XPos><YPos>84</YPos><SelStart>4050</SelStart><SelEnd>4050</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

     <Positions>

       

       

       

       

       

-    <Top><Row0><Sizes><Toolbar-00aa9b50><key>iaridepm.enu1</key></Toolbar-00aa9b50></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>314</Right><x>-2</x><y>-2</y><xscreen>316</xscreen><yscreen>205</yscreen><sizeHorzCX>188095</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>188095</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

+    <Top><Row0><Sizes><Toolbar-00aa9938><key>iaridepm.enu1</key></Toolbar-00aa9938></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>314</Right><x>-2</x><y>-2</y><xscreen>316</xscreen><yscreen>205</yscreen><sizeHorzCX>188095</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>188095</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

   </Desktop>

 </Workspace>