Continued V850 development.

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

diff --git a/Demo/NEC_V850ES_Fx3_IAR/main.c b/Demo/NEC_V850ES_Fx3_IAR/main.c
index 604a7cd2c0d7ce64103ceab4ad628e1f0e70f71c..b32f85e8fac2599ee8f396f743898781c7cecd13 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/main.c
+++ b/Demo/NEC_V850ES_Fx3_IAR/main.c
@@ -110,8 +110,9 @@ mechanism is working correctly. */
 #define mainNO_ERROR_DELAY             ( ( portTickType ) 3000 / portTICK_RATE_MS  )\r
 #define mainERROR_DELAY                        ( ( portTickType ) 500 / portTICK_RATE_MS )\r
 \r
-/* The LEDs used by the demos. */\r
-#define mainCHECK_TASK_LED             ( 0 )\r
+/* There are no spare LEDs for the comtest tasks, so this is just set to an\r
+invalid number. */\r
+#define mainCOMTEST_LED                        ( 4 )\r
 \r
 /* The baud rate used by the comtest task. */\r
 #define mainBAUD_RATE                  ( 9600 )\r
@@ -184,6 +185,7 @@ void main( void )
 static void prvCheckTask( void *pvParameters )\r
 {\r
 portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;\r
+unsigned portBASE_TYPE uxLEDToUse = 0;\r
 \r
        /* Ensure parameter is passed in correctly. */\r
        if( pvParameters != mainCHECK_PARAMETER )\r
@@ -247,11 +249,15 @@ portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;
                        if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
                        {\r
                                xDelayPeriod = mainERROR_DELAY;\r
-                       }                       \r
+                       }               \r
+                       \r
+                       /* The application board has more LEDs and uses the flash tasks\r
+                       so the check task instead uses LED3 as LED3 is still spare. */\r
+                       uxLEDToUse = 3;\r
                }\r
                #endif\r
 \r
-               vParTestToggleLED( mainCHECK_TASK_LED );\r
+               vParTestToggleLED( uxLEDToUse );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r

diff --git a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
index 294e07455ecbfacdf053bde492633b5bbb957cc6..d530d198f656a6b149c6192f5dcfc450025fc3f5 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
+++ b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp
@@ -1305,7 +1305,7 @@
         <option>\r
           <name>OAIncludePath2</name>\r
           <state>$PROJ_DIR$</state>\r
-          <state>$PROJ_DIR$\..\..\Source\portable\IAR\V850ES_Fx3</state>\r
+          <state>$PROJ_DIR$\..\..\Source\portable\IAR\V850ES</state>\r
         </option>\r
         <option>\r
           <name>OAStdIncCheck</name>\r

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat
index c6f9b9b8b35aa94ac0314ebabfbb6894ec1c6b4f..ef6e21dbe0851f95e8cd3c6a417a1232450a5ff7 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat
@@ -22,7 +22,7 @@
 @REM but they are listed at the end of this file for reference.\r
 \r
 \r
-"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\v850proc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\v850minicube2.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\<libsupport_plugin>" --backend -B "-v11" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\CONFIG\DDF\io70f3707.ddf" "-d" "minicube2" "-c2" \r
+"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\v850proc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\v850minicube2.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\bin\<libsupport_plugin>" --backend -B "-v11" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\CONFIG\DDF\io70f3717.ddf" "-d" "minicube2" "-c2" \r
 \r
 \r
 @REM Loaded plugins:\r

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
index a55cd6b2f06bb3700453c0f51c55b65c4f93ad4a..419f959343e9e2cf7bfcfbf0819767b4ce3eadd2 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt
@@ -16,7 +16,7 @@
           \r
           \r
           \r
-        <Column0>212</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>270</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Disassembly>\r
         \r
@@ -27,7 +27,7 @@
       \r
       \r
       \r
-    <Wnd1>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-757-1323</Identity>\r
@@ -43,7 +43,7 @@
           </Tab>\r
         <Tab><Identity>TabID-20969-27878</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-27119-4411</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd1><Wnd2>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd3>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-11505-1326</Identity>\r
@@ -55,20 +55,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd5><Tabs><Tab><Identity>TabID-5934-2255</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>119</YPos><SelStart>5726</SelStart><SelEnd>5726</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>582</YPos><SelStart>21916</SelStart><SelEnd>21916</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES\port.c</Filename><XPos>0</XPos><YPos>141</YPos><SelStart>7270</SelStart><SelEnd>7270</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES\portasm_Hx2.s85</Filename><XPos>0</XPos><YPos>301</YPos><SelStart>12381</SelStart><SelEnd>12381</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>120</YPos><SelStart>5785</SelStart><SelEnd>5785</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00aa9700><key>iaridepm.enu1</key></Toolbar-00aa9700><Toolbar-029689d8><key>debuggergui.enu1</key></Toolbar-029689d8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>286</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>205714</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>200</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00aa9920><key>iaridepm.enu1</key></Toolbar-00aa9920><Toolbar-038e2ab8><key>debuggergui.enu1</key></Toolbar-038e2ab8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>344</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>205952</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><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>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni
index b490265f4c872a2bd54a8ae1f66d799f3646c4d1..5ef85e6ad588f9f9c893c7a6927d2b6bedf0013e 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni
@@ -143,9 +143,9 @@ Tim2Stop9=0,0,0,0,0,0,0,0,0,0
 CoverSettings=0,1048575,66060288,67108863,0,0,0\r
 CoverSettings2=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\r
 Version=1\r
-LastDevFile=DF3707.800\r
-Map0=0,0,262143,256,3\r
-Map1=1,67092480,67104767,12,3\r
+LastDevFile=DF3717.800\r
+Map0=0,0,393215,384,3\r
+Map1=1,67043328,67104767,32,3\r
 NWsettings=1,5000,0,1,FFFFFFFFFFFFFFFFFFFF\r
 NWsettings2=1\r
 [DisAssemblyWindow]\r

diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
index 7877cf9a89aaeed9c1edcfd576023ec7ee00007c..4e0546239719e482929ed0a2f613a1ad3112e901 100644 (file)
--- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
+++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt
@@ -3,7 +3,7 @@
 <Workspace>\r
   <ConfigDictionary>\r
     \r
-  <CurrentConfigs><Project>rtosdemo/V850ESHx2</Project></CurrentConfigs></ConfigDictionary>\r
+  <CurrentConfigs><Project>rtosdemo/V850ESJx2</Project></CurrentConfigs></ConfigDictionary>\r
   <Desktop>\r
     <Static>\r
       <Workspace>\r
@@ -12,7 +12,7 @@
           \r
           \r
           \r
-        <Column0>240</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>303</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build><Debug-Log/><TerminalIO/></Static>\r
     <Windows>\r
@@ -35,14 +35,14 @@
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>119</YPos><SelStart>5726</SelStart><SelEnd>5726</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c</Filename><XPos>0</XPos><YPos>120</YPos><SelStart>5785</SelStart><SelEnd>5785</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00aa9700><key>iaridepm.enu1</key></Toolbar-00aa9700></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>612</Bottom><Right>314</Right><x>-2</x><y>-2</y><xscreen>316</xscreen><yscreen>205</yscreen><sizeHorzCX>225714</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>225714</sizeVertCX><sizeVertCY>625255</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>326</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>328</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>334012</sizeHorzCY><sizeVertCX>171429</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00aa9920><key>iaridepm.enu1</key></Toolbar-00aa9920></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>612</Bottom><Right>377</Right><x>-2</x><y>-2</y><xscreen>379</xscreen><yscreen>205</yscreen><sizeHorzCX>225595</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>225595</sizeVertCX><sizeVertCY>625255</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>326</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>328</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>334012</sizeHorzCY><sizeVertCX>171429</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r