From: richardbarry Date: Mon, 4 Mar 2013 13:18:19 +0000 (+0000) Subject: Abstract the IO port handling to toggle the LED into LED.h so the same code can work... X-Git-Tag: V7.4.1~40 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=65af2e47fccee1d55c60995c4d064eafe8c1bec0;p=freertos Abstract the IO port handling to toggle the LED into LED.h so the same code can work with multiple eval boards. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1835 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/FreeRTOSConfig.h index d9cef0130..a56fe55f8 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/FreeRTOSConfig.h @@ -91,7 +91,6 @@ asm file. It is valid in a C file, but not valid in an asm file. */ #ifdef __IAR_SYSTEMS_ICC__ -// #pragma language=extended #pragma system_include #include diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/LED.h b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/LED.h new file mode 100644 index 000000000..b51c12516 --- /dev/null +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/LED.h @@ -0,0 +1,102 @@ +/* + FreeRTOS V7.4.0 - Copyright (C) 2013 Real Time Engineers Ltd. + + FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT + http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. + + *************************************************************************** + * * + * FreeRTOS tutorial books are available in pdf and paperback. * + * Complete, revised, and edited pdf reference manuals are also * + * available. * + * * + * Purchasing FreeRTOS documentation will not only help you, by * + * ensuring you get running as quickly as possible and with an * + * in-depth knowledge of how to use FreeRTOS, it will also help * + * the FreeRTOS project to continue with its mission of providing * + * professional grade, cross platform, de facto standard solutions * + * for microcontrollers - completely free of charge! * + * * + * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * + * * + * Thank you for using FreeRTOS, and thank you for your support! * + * * + *************************************************************************** + + + This file is part of the FreeRTOS distribution. + + FreeRTOS is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License (version 2) as published by the + Free Software Foundation AND MODIFIED BY the FreeRTOS exception. + + >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to + distribute a combined work that includes FreeRTOS without being obliged to + provide the source code for proprietary components outside of the FreeRTOS + kernel. + + FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + details. You should have received a copy of the GNU General Public License + and the FreeRTOS license exception along with FreeRTOS; if not itcan be + viewed here: http://www.freertos.org/a00114.html and also obtained by + writing to Real Time Engineers Ltd., contact details for whom are available + on the FreeRTOS WEB site. + + 1 tab == 4 spaces! + + *************************************************************************** + * * + * Having a problem? Start by reading the FAQ "My application does * + * not run, what could be wrong?" * + * * + * http://www.FreeRTOS.org/FAQHelp.html * + * * + *************************************************************************** + + + http://www.FreeRTOS.org - Documentation, books, training, latest versions, + license and Real Time Engineers Ltd. contact details. + + http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, + including FreeRTOS+Trace - an indispensable productivity tool, and our new + fully thread aware and reentrant UDP/IP stack. + + http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High + Integrity Systems, who sell the code with commercial support, + indemnification and middleware, under the OpenRTOS brand. + + http://www.SafeRTOS.com - High Integrity Systems also provide a safety + engineered and independently SIL3 certified version for use in safety and + mission critical applications that require provable dependability. +*/ + +/* + * Board specific macros to initialise and toggle an LED. + */ + +#ifndef LED_IO_H +#define LED_IO_H + + #ifdef YRPBRL78G13 + #define LED_BIT ( P7_bit.no7 ) + #define LED_INIT() P7 &= 0x7F; PM7 &= 0x7F + #endif /* YRPBRL78G13 */ + + #ifdef YRDKRL78G14 + #define LED_BIT ( P1_bit.no0 ) + #define LED_INIT() P1 &= 0xFE; PM1 &= 0xFE + #endif /* YRDKRL78G14 */ + + #ifdef RSKRL78G1C + #define LED_BIT ( P0_bit.no1 ) + #define LED_INIT() P0 &= 0xFD; PM0 &= 0xFD + #endif /* RSKRL78G1C */ + + #ifndef LED_BIT + #error The hardware platform is not defined + #endif + +#endif /* LED_IO_H */ + diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewd index 94f97c0c2..be7f83aed 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewd @@ -121,7 +121,7 @@ E1RL78 1 - 0 + 1 1 1 + E20RL78 1 - 0 + 1 1 1 + @@ -255,10 +263,6 @@ $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin 0 - - $TOOLKIT_DIR$\plugins\rtos\FreeRTOS\OpenRTOSPlugin.ewplugin - 0 - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin 0 @@ -275,6 +279,10 @@ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin 1 @@ -284,12 +292,12 @@ 0 - $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin 1 - $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin - 1 + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 @@ -324,7 +332,7 @@ E20RL78 1 - 0 + 1 1 1 + @@ -547,7 +563,302 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\FreeRTOS\OpenRTOSPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-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\SymList\SymList.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + + RSKRL78G1C + + RL78 + + 1 + + C-SPY + 1 + + 0 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + E1RL78 + 1 + + 1 + 1 + 1 + + + + + + + + + + E20RL78 + 1 + + 1 + 1 + 1 + + + + + + + + + + IECRL78 + 1 + + 0 + 1 + 1 + + + + + + + + + + SIMRL78 + 1 + + 0 + 1 + 1 + + + + + TKRL78 + 1 + + 0 + 1 + 1 + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin 0 @@ -566,6 +877,10 @@ $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin 1 @@ -575,12 +890,12 @@ 0 - $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin 1 - $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin - 1 + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewp index 573347038..4d47a2fce 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewp +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/RTOSDemo.ewp @@ -10,11 +10,15 @@ 1 General - 4 + 5 1 1 1 + ICCRL78 - 3 + 5 - 6 + 7 1 1 - - + ARL78 - 3 + 5 - 1 + 2 1 1 + @@ -574,7 +578,7 @@ XLINK - 3 + 5 14 1 @@ -860,7 +864,7 @@ XAR - 3 + 5 0 1 @@ -881,7 +885,7 @@ INTERNAL_HWSUPPORT - 3 + 5 @@ -898,11 +902,15 @@ 1 General - 4 + 5 1 1 1 + ICCRL78 - 3 + 5 - 6 + 7 1 1 - - + ARL78 - 3 + 5 - 1 + 2 1 1 + @@ -1462,7 +1470,7 @@ XLINK - 3 + 5 14 1 @@ -1539,7 +1547,7 @@ XAR - 3 + 5 0 1 @@ -1769,7 +1777,899 @@ INTERNAL_HWSUPPORT - 3 + 5 + + + + BILINK + 0 + + + + + RSKRL78G1C + + RL78 + + 1 + + General + 5 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCRL78 + 5 + + 7 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARL78 + 5 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + XLINK + 5 + + 14 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XAR + 5 + + 0 + 1 + 1 + + + + + + + INTERNAL_HWSUPPORT + 5 diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c index 499676718..753aa7a52 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/main.c @@ -133,6 +133,11 @@ #include "PollQ.h" #include "blocktim.h" +/* Hardware includes. */ +#include "port_iodefine.h" +#include "port_iodefine_ext.h" +#include "LED.h" + /* The period at which the check timer will expire, in ms, provided no errors have been reported by any of the standard demo tasks. ms are converted to the equivalent in ticks using the portTICK_RATE_MS constant. */ @@ -151,9 +156,6 @@ its own executions. */ #define mainDEMO_TIMER_INCREMENTS_PER_CHECK_TIMER_TIMEOUT ( 100UL ) #define mainDEMO_TIMER_PERIOD_MS ( mainCHECK_TIMER_PERIOD_MS / mainDEMO_TIMER_INCREMENTS_PER_CHECK_TIMER_TIMEOUT ) -/* The LED toggled by the check timer. */ -#define mainLED_0 P1_bit.no0 - /* A block time of zero simple means "don't block". */ #define mainDONT_BLOCK ( 0U ) @@ -226,7 +228,7 @@ short main( void ) /* Create the RegTest tasks as described at the top of this file. */ xTaskCreate( vRegTest1, "Reg1", configMINIMAL_STACK_SIZE, NULL, 0, NULL ); - xTaskCreate( vRegTest2, "Reg2", configMINIMAL_STACK_SIZE, NULL, 0, NULL ); + xTaskCreate( vRegTest2, "Reg2", configMINIMAL_STACK_SIZE, NULL, 0, NULL ); /* Create the software timer that performs the 'check' functionality, as described at the top of this file. */ @@ -236,7 +238,7 @@ short main( void ) ( void * ) 0, /* The ID is not used, so can be set to anything. */ prvCheckTimerCallback /* The callback function that inspects the status of all the other tasks. */ ); - + /* Create the software timer that just increments a variable for demo purposes. */ xDemoTimer = xTimerCreate( ( const signed char * ) "DemoTimer",/* A text name, purely to help debugging. */ @@ -245,12 +247,12 @@ short main( void ) ( void * ) 0, /* The ID is not used, so can be set to anything. */ prvDemoTimerCallback /* The callback function that inspects the status of all the other tasks. */ ); - + /* Start both the check timer and the demo timer. The timers won't actually start until the scheduler is started. */ xTimerStart( xCheckTimer, mainDONT_BLOCK ); xTimerStart( xDemoTimer, mainDONT_BLOCK ); - + /* Finally start the scheduler running. */ vTaskStartScheduler(); @@ -280,12 +282,12 @@ static unsigned short usLastRegTest1Counter = 0, usLastRegTest2Counter = 0; { xErrorStatus = pdFAIL; } - + if( xArePollingQueuesStillRunning() != pdTRUE ) { xErrorStatus = pdFAIL; } - + if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) { xErrorStatus = pdFAIL; @@ -310,7 +312,7 @@ static unsigned short usLastRegTest1Counter = 0, usLastRegTest2Counter = 0; { usLastRegTest2Counter = usRegTest2LoopCounter; } - + /* Ensure that the demo software timer has expired mainDEMO_TIMER_INCREMENTS_PER_CHECK_TIMER_TIMEOUT times in between each call of this function. A critical section is not required to access @@ -327,7 +329,7 @@ static unsigned short usLastRegTest1Counter = 0, usLastRegTest2Counter = 0; { ulDemoSoftwareTimerCounter = 0UL; } - + if( ( xErrorStatus == pdFAIL ) && ( xChangedTimerPeriodAlready == pdFALSE ) ) { /* An error has occurred, but the timer's period has not yet been changed, @@ -335,52 +337,44 @@ static unsigned short usLastRegTest1Counter = 0, usLastRegTest2Counter = 0; timer's period means the LED will toggle at a faster rate, giving a visible indication that something has gone wrong. */ xChangedTimerPeriodAlready = pdTRUE; - + /* This call to xTimerChangePeriod() uses a zero block time. Functions called from inside of a timer callback function must *never* attempt to block. */ xTimerChangePeriod( xCheckTimer, ( mainERROR_CHECK_TIMER_PERIOD_MS ), mainDONT_BLOCK ); } - + /* Toggle the LED. The toggle rate will depend on whether or not an error has been found in any tasks. */ - mainLED_0 = !mainLED_0; + LED_BIT = !LED_BIT; } /*-----------------------------------------------------------*/ int __low_level_init(void) { -unsigned portCHAR ucResetFlag = RESF; +unsigned char ucResetFlag = RESF; portDISABLE_INTERRUPTS(); /* Set fMX */ CMC = 0x00; MSTOP = 1U; - + /* Set fMAIN */ MCM0 = 0U; - + /* Set fSUB */ XTSTOP = 1U; OSMC = 0x10; - + /* Set fCLK */ CSS = 0U; - + /* Set fIH */ HIOSTOP = 0U; - - /* LED port initialization - set port register. */ -// P7 &= 0x7F; - P1 &= 0xFE; - - /* Set port mode register. */ -// PM7 &= 0x7F; - PM1 &= 0xFE; - - /* Switch pin initialization - enable pull-up resistor. */ -// PU12_bit.no0 = 1; + + /* LED port initialization. */ + LED_INIT(); return pdTRUE; } @@ -431,6 +425,6 @@ volatile size_t xFreeHeapSpace; management options. If there is a lot of heap memory free then the configTOTAL_HEAP_SIZE value in FreeRTOSConfig.h can be reduced to free up RAM. */ - xFreeHeapSpace = xPortGetFreeHeapSize(); + xFreeHeapSpace = xPortGetFreeHeapSize(); } diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.cspy.bat b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.cspy.bat index 662970eac..3ee2603b8 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.cspy.bat +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.cspy.bat @@ -19,6 +19,6 @@ @REM -"C:\devtools\IAR Systems\Embedded Workbench 6.0\common\bin\cspybat" "C:\devtools\IAR Systems\Embedded Workbench 6.0\rl78\bin\rl78proc.dll" "C:\devtools\IAR Systems\Embedded Workbench 6.0\rl78\bin\rl78ocd.dll" %1 --plugin "C:\devtools\IAR Systems\Embedded Workbench 6.0\rl78\bin\rl78bat.dll" --backend -B "--core" "rl78_2" "--near_const_location" "rom0" "--near_const_start" "0xf3000" "--near_const_size" "27.75" "-p" "C:\devtools\IAR Systems\Embedded Workbench 6.0\rl78\CONFIG\DDF\ior5f104pj.ddf" "-d" "tk" +"C:\devtools\IAR Systems\Embedded Workbench 6.5\common\bin\cspybat" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78proc.dll" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78ocd.dll" %1 --plugin "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\bin\rl78bat.dll" --backend -B "--core" "rl78_1" "--near_const_location" "rom0" "--near_const_start" "0xf2000" "--near_const_size" "24.00" "-p" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\config\debugger\ior5f10jgc.ddf" "-d" "e1" diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dbgdt b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dbgdt index bbc7c8cb1..35797a0dc 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dbgdt +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dbgdt @@ -26,12 +26,12 @@ 200111Disassembly_I05002000 - 100200200ExpressionLocationTypeValue100150100100 + 100200200ExpressionLocationTypeValue100150100100 - + TabID-30626-17561 @@ -47,7 +47,7 @@ - 0 + 0 TabID-8606-17564 @@ -59,20 +59,20 @@ - 0TabID-3875-4388DisassemblyDisassembly0 + 0TabID-10616-6959DisassemblyDisassembly0 - TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h07042004200TextEditor$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c010357485748TextEditor$WS_DIR$\FreeRTOSConfig.h07648764876TextEditor$WS_DIR$\RegTest.s87012452135213TextEditor$WS_DIR$\..\..\Source\tasks.c012454636746367TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine.h07502311823118TextEditor$WS_DIR$\main.c018510072100726TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port.c023195429542TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine_ext.h030394679467TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portasm.s8706540924092TextEditor$WS_DIR$\..\Common\Minimal\dynamic.c037016102161020100000010000001 + TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h00000000TextEditor$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c00000000TextEditor$WS_DIR$\FreeRTOSConfig.h00000000TextEditor$WS_DIR$\RegTest.s870000017365866586TextEditor$WS_DIR$\..\..\Source\tasks.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine.h00000000TextEditor$WS_DIR$\main.c0000019510359103596TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine_ext.h00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portasm.s8700000000TextEditor$WS_DIR$\..\Common\Minimal\dynamic.c00000000TextEditor$WS_DIR$\LED.h000000000100000010000001 - iaridepm.enu1debuggergui.enu1rl78ocd.enu1-2-2808316-2-214110883929109980189286824847-2-2808684-2-2200200119048203666408333824847-2-21061682-2-21684108100238110998083929109980 + iaridepm.enu1debuggergui.enu1rl78ocd.enu1-2-2808316-2-214110883929109980189286824847-2-2808198-2-2200200119048203666119048824847-2-21061682-2-21684108100238110998083929109980 diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dni b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dni index fa359aaec..7ff991741 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dni +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.dni @@ -15,7 +15,7 @@ TypeViolation=1 UnspecRange=1 ActionState=1 [DebugChecksum] -Checksum=104434279 +Checksum=1634009173 [DisAssemblyWindow] NumStates=_ 1 State 1=_ 1 @@ -24,12 +24,12 @@ Enabled=_ 0 [CodeCoverage] Enabled=_ 0 [E1] -Map0=0,0,262143,262144 -Map1=1,1023744,1048319,24576 +Map0=0,0,32767,32768 +Map1=1,1042688,1048319,5632 MapEntries=2 -HWsettings=3,0,1,2,4,0,1,0,16,1 +HWsettings=2,0,1,2,4,0,1,0,16,1,0 HWsettingsCube=2,4294967295,2,4294967295,0,1,0,0 -HWsettingsRsuid=FFFFFFFFFFFFFFFFFFFF +HWsettingsRsuid=00000000000000000000 EventEntries=0 SeqName0= SeqData0=0,0 @@ -71,15 +71,15 @@ SeqEnable34=0,0,0,0,0,0,0,0,0,0 SeqEnable44=0,0,0,0,0,0,0,0,0,0 SeqDisable4=0,0,0,0,0,0,0,0,0,0 SeqData24=0,0,0,0,0,0 -TraceSettings=64,0,0,0,0,0,8192 +TraceSettings=128,0,0,0,0,0,8192 TimerSettings=0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 CoverSettings=1048192,1048207,0 -Version=1,xxx.txt -LastDevFile=DR5F104PJ.DVF +Version=1,trace.txt +LastDevFile=DR5F10JGC.DVF EmulType=64 BreakToggle=0 -EventLimits=0,1,1,0,0,0,2 -LastSetupFailed=1 +EventLimits=0,1,1,0,0,0,1 +LastSetupFailed=0 ForceHwSetup=0 [StackPlugin] Enabled=1 @@ -96,7 +96,7 @@ LastSetupFailed=0 Map0=0,0,262143,262144 Map1=1,1023744,1048319,24576 MapEntries=2 -HWsettings=3,0,1,2,4,0,1,0,16,1 +HWsettings=3,0,1,2,4,0,1,0,16,1,0 HWsettingsCube=2,4294967295,2,4294967295,0,1,0,0 HWsettingsRsuid=00000000000000000000 EventEntries=0 @@ -163,6 +163,13 @@ ByteLimit=50 ShowArgs=0 [Disassembly] MixedMode=1 +[DataSample] +LogEnabled=0 +GraphEnabled=0 +ShowTimeLog=1 +ShowTimeSum=1 +[Breakpoints] +Count=0 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -170,6 +177,10 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" +[Aliases] +A0=_ "C:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87" "E:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87" +Count=1 +SuppressDialog=1 [TraceHelper] Enabled=0 ShowSource=1 @@ -181,9 +192,3 @@ Mode=0 Graph=0 Symbiont=0 Exclusions= -[Breakpoints] -Count=0 -[Aliases] -A0=_ "C:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87" "E:\Data\RL78_STICK\FreeRTOSV6.1.1\Source\portable\IAR\RL78\portasm.s87" -Count=1 -SuppressDialog=1 diff --git a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.wsdt b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.wsdt index be861fea0..fe68ffdb5 100644 --- a/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.wsdt +++ b/FreeRTOS/Demo/RL78_RL78G13_Promo_Board_IAR/settings/rtosdemo.wsdt @@ -3,7 +3,7 @@ - RTOSDemo/YRDKRL78G14 + RTOSDemo/RSKRL78G1C @@ -12,7 +12,7 @@ - 319272727 + 335272727 206841824520121811143962753 @@ -25,7 +25,7 @@ Workspace - RTOSDemoRTOSDemo/Demo SourceRTOSDemo/Kernel SourceRTOSDemo/Kernel Source/port.c + RTOSDemo @@ -35,14 +35,14 @@ - TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h07042004200TextEditor$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c010357485748TextEditor$WS_DIR$\FreeRTOSConfig.h07648764876TextEditor$WS_DIR$\RegTest.s87012452135213TextEditor$WS_DIR$\..\..\Source\tasks.c012454636746367TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine.h07502311823118TextEditor$WS_DIR$\main.c018510072100726TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port.c023195429542TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine_ext.h030394679467TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portasm.s8706540924092TextEditor$WS_DIR$\..\Common\Minimal\dynamic.c037016102161020100000010000001 + TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h00000000TextEditor$WS_DIR$\..\..\Source\portable\MemMang\heap_1.c00000000TextEditor$WS_DIR$\FreeRTOSConfig.h00000000TextEditor$WS_DIR$\RegTest.s870000017365866586TextEditor$WS_DIR$\..\..\Source\tasks.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine.h00000000TextEditor$WS_DIR$\main.c000002041065310653TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port.c00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\port_iodefine_ext.h00000000TextEditor$WS_DIR$\..\..\Source\portable\IAR\RL78\portasm.s8700000000TextEditor$WS_DIR$\..\Common\Minimal\dynamic.c000003711649516495TextEditor$WS_DIR$\LED.h000006646544654110100000010000001 - iaridepm.enu1-2-2639409-2-2647471385119479633244643652749-2-22991682-2-216843011002381306517505357608961 + iaridepm.enu1-2-2639409-2-2647471385119479633244643652749-2-22991682-2-216843011002381306517505357608961