Continued V850 development.

This commit is contained in:
Richard Barry 2009-01-29 21:26:10 +00:00
parent 38511e8174
commit c7ff0f4b53
8 changed files with 3671 additions and 1236 deletions

View file

@ -114,16 +114,34 @@
are dependent on the variant being used. */
#ifdef __IAR_V850ES_Fx3__
#include "io70f3385.h"
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 60000 ) )
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 20000 ) )
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 48000000 )
#endif
#ifdef __IAR_V850ES_Jx3__
#include "io70f3746.h"
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 60000 ) )
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 9000 ) )
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 16000000 )
#endif
#ifdef __IAR_V850ES_Jx3_L__
#include "io70f3738.h"
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 9000 ) )
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 20000000 )
#endif
#ifdef __IAR_V850ES_Jx2__
#include "io70f3717.h"
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 9000 ) )
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 20000000 )
#endif
#ifdef __IAR_V850ES_Hx2__
#include "io70f3707.h"
#define configTOTAL_HEAP_SIZE ( (size_t ) ( 9000 ) )
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 20000000 )
#endif
#endif /* __IAR_SYSTEMS_ICC__ */
#endif /* FREERTOS_CONFIG_H */

View file

@ -143,11 +143,8 @@ void main( void )
/* Standard demo tasks. */
vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY );
vStartQueuePeekTasks();
vStartRecursiveMutexTasks();
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
/* Create the check task as described at the top of this file. */
xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, mainCHECK_PARAMETER, mainCHECK_TASK_PRIORITY, NULL );
@ -156,12 +153,17 @@ void main( void )
xTaskCreate( vRegTest1, "Reg1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
xTaskCreate( vRegTest2, "Reg2", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );
/* The extra IO required for the com test and led flashing tasks is only
available on the application board, not the target boards. */
#ifdef __IAR_V850ES_Fx3__
{
/* The extra IO required for the com test and led flashing tasks is only
available on the application board, not the target boards. */
vAltStartComTestTasks( mainCOMTEST_PRIORITY, mainBAUD_RATE, mainCOMTEST_LED );
vStartLEDFlashTasks( mainFLASH_PRIORITY );
/* The Fx3 also has enough RAM to run loads more tasks. */
vStartRecursiveMutexTasks();
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
}
#endif
@ -214,37 +216,38 @@ portTickType xDelayPeriod = mainNO_ERROR_DELAY, xLastWakeTime;
xDelayPeriod = mainERROR_DELAY;
}
if( xAreBlockingQueuesStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xAreSemaphoreTasksStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xArePollingQueuesStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xIsCreateTaskStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
/* The Fx3 runs more tasks, so more checks are performed. */
#ifdef __IAR_V850ES_Fx3__
{
if( xAreComTestTasksStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xArePollingQueuesStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xAreBlockingQueuesStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
{
xDelayPeriod = mainERROR_DELAY;
}
}
#endif

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -22,7 +22,7 @@
@REM but they are listed at the end of this file for reference.
"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\io70f3746.ddf" "-d" "minicube2" "-c2"
"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"
@REM Loaded plugins:

View file

@ -16,7 +16,7 @@
<Column0>270</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>212</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Disassembly>
@ -43,7 +43,7 @@
</Tab>
<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>
<SelectedTab>0</SelectedTab></Wnd1><Wnd3>
<SelectedTab>0</SelectedTab></Wnd1><Wnd2>
<Tabs>
<Tab>
<Identity>TabID-11505-1326</Identity>
@ -55,20 +55,20 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd3></Windows>
<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>
<Editor>
<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\queue.c</Filename><XPos>0</XPos><YPos>1213</YPos><SelStart>39549</SelStart><SelEnd>39549</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>121</YPos><SelStart>3946</SelStart><SelEnd>3946</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>7932</SelStart><SelEnd>7932</SelEnd></Tab></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>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>
<Positions>
<Top><Row0><Sizes><Toolbar-00aa9b70><key>iaridepm.enu1</key></Toolbar-00aa9b70><Toolbar-02a6bd80><key>debuggergui.enu1</key></Toolbar-02a6bd80></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><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>
<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>
</Desktop>
</Project>

View file

@ -74,7 +74,7 @@ LastSetupFailed=0
[MINICUBE2]
LastSetupFailed=0
MapEntries=2
HWsettings=11,33024,8155,0,160,0,0,1
HWsettings=11,33280,8155,0,160,0,0,1
HWsettings2=0
HWsettings3=124,2
EventEntries=0
@ -143,9 +143,9 @@ Tim2Stop9=0,0,0,0,0,0,0,0,0,0
CoverSettings=0,1048575,66060288,67108863,0,0,0
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
Version=1
LastDevFile=DF3746.800
Map0=0,0,1048575,1024,3
Map1=1,67043328,67104767,60,3
LastDevFile=DF3707.800
Map0=0,0,262143,256,3
Map1=1,67092480,67104767,12,3
NWsettings=1,5000,0,1,FFFFFFFFFFFFFFFFFFFF
NWsettings2=1
[DisAssemblyWindow]

View file

@ -3,7 +3,7 @@
<Workspace>
<ConfigDictionary>
<CurrentConfigs><Project>rtosdemo/V850ESJx3</Project></CurrentConfigs></ConfigDictionary>
<CurrentConfigs><Project>rtosdemo/V850ESHx2</Project></CurrentConfigs></ConfigDictionary>
<Desktop>
<Static>
<Workspace>
@ -17,7 +17,7 @@
<Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build><Debug-Log/><TerminalIO/></Static>
<Windows>
<Wnd0>
<Wnd2>
<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/demo source/Low level init</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode><ExpandedNode>rtosdemo/kernel source/device specific</ExpandedNode></NodeDict></Session>
<NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/demo source</ExpandedNode><ExpandedNode>rtosdemo/kernel source</ExpandedNode></NodeDict></Session>
</Tab>
</Tabs>
<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>
<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>
<Editor>
<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\queue.c</Filename><XPos>0</XPos><YPos>1213</YPos><SelStart>39549</SelStart><SelEnd>39549</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85</Filename><XPos>0</XPos><YPos>121</YPos><SelStart>3946</SelStart><SelEnd>3946</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>7932</SelStart><SelEnd>7932</SelEnd></Tab></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>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>
<Positions>
<Top><Row0><Sizes><Toolbar-00aa9b70><key>iaridepm.enu1</key></Toolbar-00aa9b70></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>
<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>
</Desktop>
</Workspace>