From 400ff4a6206fc87e8f80cfca2a7312aca5cefb14 Mon Sep 17 00:00:00 2001 From: RichardBarry Date: Thu, 29 Jan 2009 21:26:10 +0000 Subject: [PATCH] Continued V850 development. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@649 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h | 22 +- Demo/NEC_V850ES_Fx3_IAR/main.c | 45 +- Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewd | 744 ++++++- Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp | 1744 ++++++++++++++++- .../settings/rtosdemo.cspy.bat | 2 +- .../settings/rtosdemo.dbgdt | 10 +- Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni | 8 +- .../NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt | 12 +- 8 files changed, 2511 insertions(+), 76 deletions(-) diff --git a/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h b/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h index 8185de841..cfc583a09 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h +++ b/Demo/NEC_V850ES_Fx3_IAR/FreeRTOSConfig.h @@ -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 */ diff --git a/Demo/NEC_V850ES_Fx3_IAR/main.c b/Demo/NEC_V850ES_Fx3_IAR/main.c index f88cb6622..604a7cd2c 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/main.c +++ b/Demo/NEC_V850ES_Fx3_IAR/main.c @@ -143,12 +143,9 @@ 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 diff --git a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewd b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewd index 704679a80..77af96001 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewd +++ b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewd @@ -3,7 +3,735 @@ 2 - Debug + V850ESJx3 + + V850 + + 1 + + C-SPY + 5 + + 12 + 1 + 1 + + + + + + + + + + + + + + + + + EMUV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + IECV850 + 5 + + 0 + 1 + 1 + + + + + + + + + MICV850 + 5 + + 1 + 1 + 1 + + + + + + + + + + + + NWIV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + ROMV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + + + + + + + SIMV850 + 5 + + 0 + 1 + 1 + + + + + + + + TKSV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + + + + + V850ESFx3 + + V850 + + 1 + + C-SPY + 5 + + 12 + 1 + 1 + + + + + + + + + + + + + + + + + EMUV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + IECV850 + 5 + + 0 + 1 + 1 + + + + + + + + + MICV850 + 5 + + 1 + 1 + 1 + + + + + + + + + + + + NWIV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + ROMV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + + + + + + + SIMV850 + 5 + + 0 + 1 + 1 + + + + + + + + TKSV850 + 5 + + 0 + 1 + 1 + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + + + + + V850ESJx3L V850 @@ -49,7 +777,7 @@ @@ -367,7 +1095,7 @@ - V850ESJx3 + V850ESJx2 V850 @@ -413,7 +1141,7 @@ - V850ESFx3 + V850ESHx2 V850 @@ -777,7 +1505,7 @@ diff --git a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp index bc82becfa..294e07455 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp +++ b/Demo/NEC_V850ES_Fx3_IAR/rtosdemo.ewp @@ -3,7 +3,1655 @@ 2 - Debug + V850ESJx3 + + V850 + + 1 + + General + 5 + + 5 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCV850 + 3 + + 14 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AV850 + 3 + + 5 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + XLINK + 3 + + 15 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XAR + 3 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + V850ESFx3 + + V850 + + 1 + + General + 5 + + 5 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCV850 + 3 + + 14 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AV850 + 3 + + 5 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + XLINK + 3 + + 15 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XAR + 3 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + V850ESJx3L V850 @@ -29,15 +1677,15 @@ - V850ESJx3 + V850ESJx2 V850 @@ -853,15 +2501,15 @@ - V850ESFx3 + V850ESHx2 V850 @@ -1677,15 +3325,15 @@ diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.cspy.bat index 083924712..c6f9b9b8b 100644 --- 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. -"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\" --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\" --backend -B "-v11" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\v850\CONFIG\DDF\io70f3707.ddf" "-d" "minicube2" "-c2" @REM Loaded plugins: diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt index a2228dd1d..a55cd6b2f 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt +++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dbgdt @@ -16,7 +16,7 @@ - 270272727 + 212272727 @@ -43,7 +43,7 @@ TabID-20969-27878Find in FilesFind-in-FilesTabID-27119-4411BreakpointsBreakpoints - 0 + 0 TabID-11505-1326 @@ -55,20 +55,20 @@ - 0 + 0TabID-5934-2255DisassemblyDisassembly0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c0119572657260TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c012133954939549TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85012139463946TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c0170793279320100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c0119572657260TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c05822191621916TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES\port.c014172707270TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES\portasm_Hx2.s85030112381123810100000010000001 - iaridepm.enu1debuggergui.enu1-2-2740344-2-2240200142857203666205952755601-2-21981682-2-216842001002381203666142857203666 + iaridepm.enu1debuggergui.enu1-2-2740286-2-2200200142857203666205714755601-2-2740198-2-2200200142857203666142857755601-2-21981402-2-214042001002857203666142857203666 diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni index 06da2be5c..b490265f4 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni +++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.dni @@ -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] diff --git a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt index ce45b0e5b..7877cf9a8 100644 --- a/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt +++ b/Demo/NEC_V850ES_Fx3_IAR/settings/rtosdemo.wsdt @@ -3,7 +3,7 @@ - rtosdemo/V850ESJx3 + rtosdemo/V850ESHx2 @@ -17,7 +17,7 @@ 20121632481 - + TabID-30435-11592 @@ -25,24 +25,24 @@ Workspace - rtosdemortosdemo/demo sourcertosdemo/demo source/Low level initrtosdemo/kernel sourcertosdemo/kernel source/device specific + rtosdemortosdemo/demo sourcertosdemo/kernel source - 0TabID-2785-875BuildBuildTabID-21438-1140Debug LogDebug-LogTabID-21061-4073BreakpointsBreakpoints0 + 0TabID-2785-875BuildBuildTabID-21438-1140Debug LogDebug-LogTabID-21061-4073BreakpointsBreakpoints0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c0119572657260TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c012133954939549TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\RegTest.s85012139463946TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\V850ES_Fx3\port.c0170793279320100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_V850ES_Fx3_IAR\main.c01195726572600100000010000001 - iaridepm.enu1-2-2740314-2-2316205188095208758188095755601-2-21981682-2-216842001002381203666142857203666 + iaridepm.enu1-2-2612314-2-2316205225714208758225714625255-2-23261402-2-214043281002857334012171429203666 -- 2.39.5