diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h
index d14ddd2a4..195a977cb 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h
@@ -170,7 +170,6 @@ to all Cortex-M ports, and do not rely on any particular library functions. */
header file. */
void vAssertCalled( void );
#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled();
-#define INCLUDE_MODULE_TEST 0
/* The configPRE_SLEEP_PROCESSING() and configPOST_SLEEP_PROCESSING() macros
allow the application writer to add additional code before and after the MCU is
diff --git a/FreeRTOS/Demo/Common/Minimal/GenQTest.c b/FreeRTOS/Demo/Common/Minimal/GenQTest.c
index b306984d6..6273e0591 100644
--- a/FreeRTOS/Demo/Common/Minimal/GenQTest.c
+++ b/FreeRTOS/Demo/Common/Minimal/GenQTest.c
@@ -134,7 +134,7 @@ static void prvHighPriorityMutexTask( void *pvParameters );
/* Flag that will be latched to pdTRUE should any unexpected behaviour be
detected in any of the tasks. */
-static portBASE_TYPE xErrorDetected = pdFALSE;
+static volatile portBASE_TYPE xErrorDetected = pdFALSE;
/* Counters that are incremented on each cycle of a test. This is used to
detect a stalled task - a test that is no longer running. */
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd
index d0d8eedf7..075bcab69 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd
@@ -348,7 +348,7 @@
DynDriver
- TKRL78
+ SIMRL78
DebugDDFOverride
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp
index 184d96c26..15a46bd66 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp
@@ -978,7 +978,7 @@
GenHwSupport
- 0
+ 1
GenLibInFormatter
@@ -4472,9 +4472,6 @@
$PROJ_DIR$\..\Common\Minimal\dynamic.c
-
- $PROJ_DIR$\main_full.c
-
$PROJ_DIR$\..\Common\Minimal\PollQ.c
@@ -4488,6 +4485,9 @@
$PROJ_DIR$\main_blinky.c
+
+ $PROJ_DIR$\main_full.c
+
$PROJ_DIR$\RegTest.s87
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.cspy.bat b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.cspy.bat
index 5854ae86e..b8700e73e 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.cspy.bat
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.cspy.bat
@@ -19,6 +19,6 @@
@REM
-"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" "51.75" "-p" "C:\devtools\IAR Systems\Embedded Workbench 6.5\rl78\config\debugger\ior5f10ele.ddf" "-d" "e1"
+"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\rl78sim.dll" %1 --plugin "C:\devtools\IAR Systems\Embedded Workbench 6.5\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.5\rl78\config\debugger\ior5f104pj.ddf" "-d" "sim"
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dbgdt b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dbgdt
index 240a38a67..dd2d9e0ae 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dbgdt
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dbgdt
@@ -26,12 +26,12 @@
2 0 0 1 1 1 - Disassembly
- _I0
- 500
- 20
0 0
- 1 0 0 2 0 0 2 0 0 - Expression
- Location
- Type
- Value
- 100
- 150
- 100
- 100
+ 1 0 0 2 0 0 2 0 0 - Expression
- Location
- Type
- Value
- 100
- 150
- 100
- 100
1 0 0 - Frame
- _I0
- 400
- 20
-
+
TabID-30626-17561
@@ -47,7 +47,7 @@
- 0
+ 0
TabID-8606-17564
@@ -59,20 +59,20 @@
- 0
+ 0
- TextEditor $WS_DIR$\main.c 0 0 0 0 0 147 7550 7550 0 0 1000000 1000000 1
+ TextEditor $WS_DIR$\main.c 0 0 0 0 0 146 7550 7550 TextEditor $WS_DIR$\demo_specific_io.h 0 0 0 0 0 64 4262 4262 TextEditor $WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h 0 0 0 0 0 143 7699 7699 TextEditor $WS_DIR$\FreeRTOSConfig.h 0 0 0 0 0 107 7005 7005 TextEditor $WS_DIR$\..\..\Source\portable\IAR\RL78\port.c 0 0 0 0 0 77 5879 6150 TextEditor $WS_DIR$\..\..\Source\tasks.c 0 0 0 0 0 479 23830 23830 TextEditor $WS_DIR$\main_blinky.c 0 0 0 0 0 77 5290 5290 TextEditor $WS_DIR$\..\..\Source\queue.c 0 0 0 0 0 270 12681 12681 7 TextEditor $WS_DIR$\..\..\Source\timers.c 0 0 0 0 0 640 25872 25872 TextEditor $WS_DIR$\..\Common\Minimal\dynamic.c 0 0 0 0 0 182 10489 10489 TextEditor $WS_DIR$\..\Common\Minimal\PollQ.c 0 0 0 0 0 133 7366 7366 TextEditor $WS_DIR$\..\Common\Minimal\blocktim.c 0 0 0 0 0 124 6743 6743 0 1000000 1000000 1
- iaridepm.enu1 debuggergui.enu1 rl78ocd.enu1 -2 -2 614 228 -2 -2 9 8 5357 8147 136905 627291 -2 -2 276 1682 -2 -2 1684 278 1002381 283096 5357 8147
+ iaridepm.enu1 debuggergui.enu1 -2 -2 638 228 -2 -2 9 8 5357 8147 136905 651731 -2 -2 276 1682 -2 -2 1684 278 1002381 283096 5357 8147
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dni b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dni
index 1f7a62ed4..11e5a37ba 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dni
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.dni
@@ -1,5 +1,5 @@
[DebugChecksum]
-Checksum=573869402
+Checksum=-1618849359
[DisAssemblyWindow]
NumStates=_ 1
State 1=_ 1
@@ -147,6 +147,31 @@ ByteLimit=50
ShowArgs=0
[Disassembly]
MixedMode=1
+[DataSample]
+LogEnabled=0
+GraphEnabled=0
+ShowTimeLog=1
+ShowTimeSum=1
+[TraceHelper]
+Enabled=0
+ShowSource=1
+[Log file]
+LoggingEnabled=_ 0
+LogFile=_ ""
+Category=_ 0
+[TermIOLog]
+LoggingEnabled=_ 0
+LogFile=_ ""
+[CallStackLog]
+Enabled=0
+[DriverProfiling]
+Enabled=0
+Mode=1
+Graph=0
+Symbiont=0
+Exclusions=
+[Breakpoints]
+Count=0
[InterruptLog]
LogEnabled=0
SumEnabled=0
@@ -171,35 +196,10 @@ UseAuto=0
TypeViolation=1
UnspecRange=1
ActionState=1
-[Trace1]
-Enabled=0
-ShowSource=1
-[DataSample]
-LogEnabled=0
-GraphEnabled=0
-ShowTimeLog=1
-ShowTimeSum=1
-[Log file]
-LoggingEnabled=_ 0
-LogFile=_ ""
-Category=_ 0
-[TermIOLog]
-LoggingEnabled=_ 0
-LogFile=_ ""
-[TraceHelper]
-Enabled=0
-ShowSource=1
-[CallStackLog]
-Enabled=0
-[DriverProfiling]
-Enabled=0
-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
+[Trace1]
+Enabled=0
+ShowSource=1
diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.wsdt b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.wsdt
index a57ce3847..11b5d39ec 100644
--- a/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.wsdt
+++ b/FreeRTOS/Demo/RL78_multiple_IAR/settings/rtosdemo.wsdt
@@ -3,7 +3,7 @@
- RTOSDemo/RL78_G1A_TB
+ RTOSDemo/YRDKRL78G14
@@ -25,7 +25,7 @@
Workspace
- RTOSDemo
+ RTOSDemo RTOSDemo/Demo Source
@@ -35,7 +35,7 @@
- TextEditor $WS_DIR$\main.c 0 0 0 0 0 147 7550 7550 TextEditor $WS_DIR$\demo_specific_io.h 0 0 0 0 0 64 4262 4262 TextEditor $WS_DIR$\..\..\Source\portable\IAR\RL78\portmacro.h 0 0 0 0 0 143 7699 7699 TextEditor $WS_DIR$\FreeRTOSConfig.h 0 0 0 0 0 107 0 0 3 0 1000000 1000000 1
+ TextEditor $WS_DIR$\main.c 0 0 0 0 0 72 0 0 0 0 1000000 1000000 1
diff --git a/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.suo b/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.suo
deleted file mode 100644
index 4f0b2bb74..000000000
Binary files a/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.suo and /dev/null differ
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo b/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo
deleted file mode 100644
index c99dcb1b2..000000000
Binary files a/FreeRTOS/Demo/WIN32-MSVC/WIN32.suo and /dev/null differ