From: RichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Wed, 13 Feb 2008 13:34:39 +0000 (+0000)
Subject: Continue to tidy up Fujitsu ports.
X-Git-Tag: V4.7.2~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=33be9d0541b913fbd75dedb519131bd13f13b83a;p=freertos

Continue to tidy up Fujitsu ports.

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

diff --git a/Demo/MB96340_Softune/96340_FreeRTOS_96348hs.wsp b/Demo/MB96340_Softune/96340_FreeRTOS_96348hs.wsp
index bb18593b0..0fe0ffccc 100644
--- a/Demo/MB96340_Softune/96340_FreeRTOS_96348hs.wsp
+++ b/Demo/MB96340_Softune/96340_FreeRTOS_96348hs.wsp
@@ -22,7 +22,5 @@ AutoLoad=1
 WSP=C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\
 
 [EditState]
-STATE-1=freertos_96348hs_sk16fx100pmc\src\serial\serial.c:192
-STATE-2=FreeRTOS_96348hs_SK16FX100PMC\Src\vectors.c:1
-Count=2
+Count=0
 
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/FreeRTOS_96348hs_SK16FX100PMC.prj b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/FreeRTOS_96348hs_SK16FX100PMC.prj
index 0eb59dc8b..91df3d150 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/FreeRTOS_96348hs_SK16FX100PMC.prj
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/FreeRTOS_96348hs_SK16FX100PMC.prj
@@ -17,52 +17,46 @@ PrjInfo-0=STANDALONE
 Active=STANDALONE
 
 [MEMBER]
-F0=45
+F0=39
 F1=0 f Source Files
 F2=0 c Src\Main.c
 F3=0 a Src\mb96348hs.asm
 F4=0 * readme.txt
 F5=0 a Src\Start.asm
 F6=0 c Src\vectors.c
-F7=0 f Source Files\portable
-F8=0 c ..\..\..\Source\portable\Softune\MB96340\__STD_LIB_sbrk.c
-F9=0 c ..\..\..\Source\portable\Softune\MB96340\port.c
-F10=0 f Source Files\FreeRTOS
-F11=0 c ..\..\..\Source\croutine.c
-F12=0 c ..\..\..\Source\list.c
-F13=0 c ..\..\..\Source\queue.c
-F14=0 c ..\..\..\Source\tasks.c
-F15=0 f Source Files\Minimal
-F16=0 c ..\..\Common\Minimal\AltBlckQ.c
-F17=0 c ..\..\Common\Minimal\AltBlock.c
-F18=0 c ..\..\Common\Minimal\AltPollQ.c
-F19=0 c ..\..\Common\Minimal\AltQTest.c
-F20=0 c ..\..\Common\Minimal\BlockQ.c
-F21=0 c ..\..\Common\Minimal\blocktim.c
-F22=0 c ..\..\Common\Minimal\comtest.c
-F23=0 c ..\..\Common\Minimal\countsem.c
-F24=0 c Src\crflash_sk16fx100mpc.c
-F25=0 c ..\..\Common\Minimal\crhook.c
+F7=0 f Source Files\watchdog
+F8=0 c Src\watchdog\watchdog.c
+F9=0 f Source Files\FreeRTOS Source
+F10=0 c ..\..\..\Source\croutine.c
+F11=0 c ..\..\..\Source\list.c
+F12=0 c ..\..\..\Source\queue.c
+F13=0 c ..\..\..\Source\tasks.c
+F14=0 f Source Files\FreeRTOS Source\portable
+F15=0 c ..\..\..\Source\portable\Softune\MB96340\__STD_LIB_sbrk.c
+F16=0 c ..\..\..\Source\portable\Softune\MB96340\port.c
+F17=0 f Source Files\FreeRTOS Source\MemMang
+F18=0 c ..\..\..\Source\portable\MemMang\heap_1.c
+F19=0 c ..\..\..\Source\portable\MemMang\heap_2.c
+F20=0 c ..\..\..\Source\portable\MemMang\heap_3.c
+F21=0 f Source Files\Demo Source
+F22=0 c ..\..\Common\Minimal\BlockQ.c
+F23=0 c ..\..\Common\Minimal\blocktim.c
+F24=0 c ..\..\Common\Minimal\comtest.c
+F25=0 c Src\crflash_sk16fx100mpc.c
 F26=0 c ..\..\Common\Minimal\death.c
 F27=0 c ..\..\Common\Minimal\dynamic.c
 F28=0 c ..\..\Common\Minimal\flash.c
-F29=0 c ..\..\Common\Minimal\flop.c
-F30=0 c ..\..\Common\Minimal\GenQTest.c
-F31=0 c ..\..\Common\Minimal\integer.c
-F32=0 c ..\..\Common\Minimal\PollQ.c
-F33=0 c ..\..\Common\Minimal\QPeek.c
-F34=0 c ..\..\Common\Minimal\semtest.c
-F35=0 f Source Files\MemMang
-F36=0 c ..\..\..\Source\portable\MemMang\heap_1.c
-F37=0 c ..\..\..\Source\portable\MemMang\heap_2.c
-F38=0 c ..\..\..\Source\portable\MemMang\heap_3.c
-F39=0 f Source Files\serial
-F40=0 c Src\serial\serial.c
-F41=0 f Source Files\watchdog
-F42=0 c Src\watchdog\watchdog.c
-F43=0 f Source Files\utility
-F44=0 c Src\utility\taskutility.c
-F45=0 f Include Files
+F29=0 c ..\..\Common\Minimal\GenQTest.c
+F30=0 c ..\..\Common\Minimal\integer.c
+F31=0 c ..\..\Common\Minimal\PollQ.c
+F32=0 c ..\..\Common\Minimal\semtest.c
+F33=0 f Source Files\Demo Source\partest
+F34=0 c Src\partest\partest.c
+F35=0 f Source Files\Demo Source\utility
+F36=0 c Src\utility\taskutility.c
+F37=0 f Source Files\Demo Source\serial
+F38=0 c Src\serial\serial.c
+F39=0 f Include Files
 
 [OPTIONFILE]
 FILE=options.dat
@@ -79,325 +73,304 @@ LST=STANDALONE\LST\
 OPT=STANDALONE\OPT\
 
 [MEMBER-STANDALONE]
-F0=36
+F0=29
 F1=0 m 1 STANDALONE\ABS\FreeRTOS_96348hs_SK16FX100PMC.abs
-F2=13 c 1 Src\Main.c
+F2=27 c 1 Src\Main.c
 F2-1=- src\mb96348hs.h
 F2-2=- ..\..\..\Source\include\FreeRTOS.h
 F2-3=- ..\..\..\Source\include\projdefs.h
-F2-4=- Src\config\FreeRTOSConfig.h
-F2-5=- ..\..\..\Source\include\portable.h
-F2-6=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F2-7=- ..\..\..\Source\include\task.h
-F2-8=- ..\..\..\Source\include\list.h
-F2-9=- ..\..\..\Source\include\semphr.h
-F2-10=- ..\..\..\Source\include\queue.h
-F2-11=- Src\watchdog\watchdog.h
-F2-12=- Src\config\config.h
-F2-13=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F2-4=- ..\..\..\Source\include\portable.h
+F2-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F2-6=- ..\..\..\Source\include\task.h
+F2-7=- ..\..\..\Source\include\list.h
+F2-8=- ..\..\..\Source\include\semphr.h
+F2-9=- ..\..\..\Source\include\queue.h
+F2-10=- Src\watchdog\watchdog.h
+F2-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F2-12=- ..\..\Common\include\flash.h
+F2-13=- ..\..\Common\include\integer.h
+F2-14=- ..\..\Common\include\comtest2.h
+F2-15=- ..\..\Common\include\PollQ.h
+F2-16=- ..\..\Common\include\semtest.h
+F2-17=- ..\..\Common\include\BlockQ.h
+F2-18=- ..\..\Common\include\dynamic.h
+F2-19=- ..\..\Common\include\flop.h
+F2-20=- ..\..\Common\include\GenQTest.h
+F2-21=- ..\..\Common\include\QPeek.h
+F2-22=- ..\..\Common\include\blocktim.h
+F2-23=- ..\..\Common\include\death.h
+F2-24=- ..\..\Common\include\partest.h
+F2-25=- Src\utility\taskutility.h
+F2-26=- ..\..\Common\include\crflash.h
+F2-27=- Src\FreeRTOSConfig.h
 F3=0 a 1 Src\mb96348hs.asm
 F4=0 a 1 Src\Start.asm
 F5=2 c 1 Src\vectors.c
 F5-1=- src\mb96348hs.h
-F5-2=- Src\config\config.h
+F5-2=- Src\FreeRTOSConfig.h
 F6=3 c 1 ..\..\..\Source\portable\Softune\MB96340\__STD_LIB_sbrk.c
-F6-1=- Src\config\FreeRTOSConfig.h
-F6-2=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F6-3=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F6-1=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F6-2=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F6-3=- Src\FreeRTOSConfig.h
 F7=9 c 1 ..\..\..\Source\portable\Softune\MB96340\port.c
 F7-1=- ..\..\..\Source\include\FreeRTOS.h
 F7-2=- ..\..\..\Source\include\projdefs.h
-F7-3=- Src\config\FreeRTOSConfig.h
-F7-4=- ..\..\..\Source\include\portable.h
-F7-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F7-6=- src\mb96348hs.h
-F7-7=- ..\..\..\Source\include\task.h
-F7-8=- ..\..\..\Source\include\list.h
-F7-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F7-3=- ..\..\..\Source\include\portable.h
+F7-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F7-5=- src\mb96348hs.h
+F7-6=- ..\..\..\Source\include\task.h
+F7-7=- ..\..\..\Source\include\list.h
+F7-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F7-9=- Src\FreeRTOSConfig.h
 F8=10 c 1 ..\..\..\Source\croutine.c
 F8-1=- ..\..\..\Source\include\FreeRTOS.h
 F8-2=- ..\..\..\Source\include\projdefs.h
-F8-3=- Src\config\FreeRTOSConfig.h
-F8-4=- ..\..\..\Source\include\portable.h
-F8-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F8-6=- ..\..\..\Source\include\task.h
-F8-7=- ..\..\..\Source\include\list.h
-F8-8=- ..\..\..\Source\include\croutine.h
-F8-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F8-10=- src\mb96348hs.h
+F8-3=- ..\..\..\Source\include\portable.h
+F8-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F8-5=- ..\..\..\Source\include\task.h
+F8-6=- ..\..\..\Source\include\list.h
+F8-7=- ..\..\..\Source\include\croutine.h
+F8-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F8-9=- src\mb96348hs.h
+F8-10=- Src\FreeRTOSConfig.h
 F9=9 c 1 ..\..\..\Source\list.c
 F9-1=- ..\..\..\Source\include\FreeRTOS.h
 F9-2=- ..\..\..\Source\include\projdefs.h
-F9-3=- Src\config\FreeRTOSConfig.h
-F9-4=- ..\..\..\Source\include\portable.h
-F9-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F9-6=- ..\..\..\Source\include\list.h
-F9-7=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F9-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F9-9=- src\mb96348hs.h
+F9-3=- ..\..\..\Source\include\portable.h
+F9-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F9-5=- ..\..\..\Source\include\list.h
+F9-6=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F9-7=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F9-8=- src\mb96348hs.h
+F9-9=- Src\FreeRTOSConfig.h
 F10=12 c 1 ..\..\..\Source\queue.c
 F10-1=- ..\..\..\Source\include\FreeRTOS.h
 F10-2=- ..\..\..\Source\include\projdefs.h
-F10-3=- Src\config\FreeRTOSConfig.h
-F10-4=- ..\..\..\Source\include\portable.h
-F10-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F10-6=- ..\..\..\Source\include\task.h
-F10-7=- ..\..\..\Source\include\list.h
-F10-8=- ..\..\..\Source\include\croutine.h
-F10-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F10-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F10-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\string.h
-F10-12=- src\mb96348hs.h
+F10-3=- ..\..\..\Source\include\portable.h
+F10-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F10-5=- ..\..\..\Source\include\task.h
+F10-6=- ..\..\..\Source\include\list.h
+F10-7=- ..\..\..\Source\include\croutine.h
+F10-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F10-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F10-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\string.h
+F10-11=- src\mb96348hs.h
+F10-12=- Src\FreeRTOSConfig.h
 F11=13 c 1 ..\..\..\Source\tasks.c
 F11-1=- ..\..\..\Source\include\FreeRTOS.h
 F11-2=- ..\..\..\Source\include\projdefs.h
-F11-3=- Src\config\FreeRTOSConfig.h
-F11-4=- ..\..\..\Source\include\portable.h
-F11-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F11-6=- ..\..\..\Source\include\task.h
-F11-7=- ..\..\..\Source\include\list.h
-F11-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdio.h
-F11-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F11-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdarg.h
-F11-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F11-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\string.h
-F11-13=- src\mb96348hs.h
-F12=0 c 0 ..\..\Common\Minimal\AltBlckQ.c
-F13=0 c 0 ..\..\Common\Minimal\AltBlock.c
-F14=0 c 0 ..\..\Common\Minimal\AltPollQ.c
-F15=0 c 0 ..\..\Common\Minimal\AltQTest.c
-F16=12 c 1 ..\..\Common\Minimal\BlockQ.c
+F11-3=- ..\..\..\Source\include\portable.h
+F11-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F11-5=- ..\..\..\Source\include\task.h
+F11-6=- ..\..\..\Source\include\list.h
+F11-7=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdio.h
+F11-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F11-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdarg.h
+F11-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F11-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\string.h
+F11-12=- src\mb96348hs.h
+F11-13=- Src\FreeRTOSConfig.h
+F12=12 c 1 ..\..\Common\Minimal\BlockQ.c
+F12-1=- ..\..\..\Source\include\FreeRTOS.h
+F12-2=- ..\..\..\Source\include\projdefs.h
+F12-3=- ..\..\..\Source\include\portable.h
+F12-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F12-5=- ..\..\..\Source\include\task.h
+F12-6=- ..\..\..\Source\include\list.h
+F12-7=- ..\..\..\Source\include\queue.h
+F12-8=- ..\..\Common\include\BlockQ.h
+F12-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F12-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F12-11=- src\mb96348hs.h
+F12-12=- Src\FreeRTOSConfig.h
+F13=11 c 1 ..\..\Common\Minimal\blocktim.c
+F13-1=- ..\..\..\Source\include\FreeRTOS.h
+F13-2=- ..\..\..\Source\include\projdefs.h
+F13-3=- ..\..\..\Source\include\portable.h
+F13-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F13-5=- ..\..\..\Source\include\task.h
+F13-6=- ..\..\..\Source\include\list.h
+F13-7=- ..\..\..\Source\include\queue.h
+F13-8=- ..\..\Common\include\blocktim.h
+F13-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F13-10=- src\mb96348hs.h
+F13-11=- Src\FreeRTOSConfig.h
+F14=13 c 1 ..\..\Common\Minimal\comtest.c
+F14-1=- ..\..\..\Source\include\FreeRTOS.h
+F14-2=- ..\..\..\Source\include\projdefs.h
+F14-3=- ..\..\..\Source\include\portable.h
+F14-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F14-5=- ..\..\..\Source\include\task.h
+F14-6=- ..\..\..\Source\include\list.h
+F14-7=- ..\..\Common\include\serial.h
+F14-8=- ..\..\Common\include\comtest.h
+F14-9=- ..\..\Common\include\partest.h
+F14-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F14-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F14-12=- src\mb96348hs.h
+F14-13=- Src\FreeRTOSConfig.h
+F15=11 c 1 ..\..\Common\Minimal\death.c
+F15-1=- ..\..\..\Source\include\FreeRTOS.h
+F15-2=- ..\..\..\Source\include\projdefs.h
+F15-3=- ..\..\..\Source\include\portable.h
+F15-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F15-5=- ..\..\..\Source\include\task.h
+F15-6=- ..\..\..\Source\include\list.h
+F15-7=- ..\..\Common\include\death.h
+F15-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F15-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F15-10=- src\mb96348hs.h
+F15-11=- Src\FreeRTOSConfig.h
+F16=13 c 1 ..\..\Common\Minimal\dynamic.c
 F16-1=- ..\..\..\Source\include\FreeRTOS.h
 F16-2=- ..\..\..\Source\include\projdefs.h
-F16-3=- Src\config\FreeRTOSConfig.h
-F16-4=- ..\..\..\Source\include\portable.h
-F16-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F16-6=- ..\..\..\Source\include\task.h
-F16-7=- ..\..\..\Source\include\list.h
+F16-3=- ..\..\..\Source\include\portable.h
+F16-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F16-5=- ..\..\..\Source\include\task.h
+F16-6=- ..\..\..\Source\include\list.h
+F16-7=- ..\..\..\Source\include\semphr.h
 F16-8=- ..\..\..\Source\include\queue.h
-F16-9=- ..\..\Common\include\BlockQ.h
+F16-9=- ..\..\Common\include\dynamic.h
 F16-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
 F16-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
 F16-12=- src\mb96348hs.h
-F17=11 c 1 ..\..\Common\Minimal\blocktim.c
+F16-13=- Src\FreeRTOSConfig.h
+F17=12 c 1 ..\..\Common\Minimal\flash.c
 F17-1=- ..\..\..\Source\include\FreeRTOS.h
 F17-2=- ..\..\..\Source\include\projdefs.h
-F17-3=- Src\config\FreeRTOSConfig.h
-F17-4=- ..\..\..\Source\include\portable.h
-F17-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F17-6=- ..\..\..\Source\include\task.h
-F17-7=- ..\..\..\Source\include\list.h
-F17-8=- ..\..\..\Source\include\queue.h
-F17-9=- ..\..\Common\include\blocktim.h
+F17-3=- ..\..\..\Source\include\portable.h
+F17-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F17-5=- ..\..\..\Source\include\task.h
+F17-6=- ..\..\..\Source\include\list.h
+F17-7=- ..\..\Common\include\partest.h
+F17-8=- ..\..\Common\include\flash.h
+F17-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
 F17-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
 F17-11=- src\mb96348hs.h
-F18=13 c 1 ..\..\Common\Minimal\comtest.c
+F17-12=- Src\FreeRTOSConfig.h
+F18=13 c 1 ..\..\Common\Minimal\GenQTest.c
 F18-1=- ..\..\..\Source\include\FreeRTOS.h
 F18-2=- ..\..\..\Source\include\projdefs.h
-F18-3=- Src\config\FreeRTOSConfig.h
-F18-4=- ..\..\..\Source\include\portable.h
-F18-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F18-6=- ..\..\..\Source\include\task.h
-F18-7=- ..\..\..\Source\include\list.h
-F18-8=- ..\..\Common\include\serial.h
-F18-9=- ..\..\Common\include\comtest.h
-F18-10=- ..\..\Common\include\partest.h
-F18-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F18-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F18-13=- src\mb96348hs.h
-F19=0 c 0 ..\..\Common\Minimal\countsem.c
-F20=11 c 1 ..\..\Common\Minimal\crhook.c
+F18-3=- ..\..\..\Source\include\portable.h
+F18-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F18-5=- ..\..\..\Source\include\task.h
+F18-6=- ..\..\..\Source\include\list.h
+F18-7=- ..\..\..\Source\include\queue.h
+F18-8=- ..\..\..\Source\include\semphr.h
+F18-9=- ..\..\Common\include\GenQTest.h
+F18-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F18-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F18-12=- src\mb96348hs.h
+F18-13=- Src\FreeRTOSConfig.h
+F19=11 c 1 ..\..\Common\Minimal\integer.c
+F19-1=- ..\..\..\Source\include\FreeRTOS.h
+F19-2=- ..\..\..\Source\include\projdefs.h
+F19-3=- ..\..\..\Source\include\portable.h
+F19-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F19-5=- ..\..\..\Source\include\task.h
+F19-6=- ..\..\..\Source\include\list.h
+F19-7=- ..\..\Common\include\integer.h
+F19-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F19-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F19-10=- src\mb96348hs.h
+F19-11=- Src\FreeRTOSConfig.h
+F20=12 c 1 ..\..\Common\Minimal\PollQ.c
 F20-1=- ..\..\..\Source\include\FreeRTOS.h
 F20-2=- ..\..\..\Source\include\projdefs.h
-F20-3=- Src\config\FreeRTOSConfig.h
-F20-4=- ..\..\..\Source\include\portable.h
-F20-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F20-6=- ..\..\..\Source\include\croutine.h
-F20-7=- ..\..\..\Source\include\list.h
-F20-8=- ..\..\..\Source\include\queue.h
-F20-9=- ..\..\Common\include\crhook.h
+F20-3=- ..\..\..\Source\include\portable.h
+F20-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F20-5=- ..\..\..\Source\include\task.h
+F20-6=- ..\..\..\Source\include\list.h
+F20-7=- ..\..\..\Source\include\queue.h
+F20-8=- ..\..\Common\include\PollQ.h
+F20-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
 F20-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
 F20-11=- src\mb96348hs.h
-F21=11 c 1 ..\..\Common\Minimal\death.c
+F20-12=- Src\FreeRTOSConfig.h
+F21=13 c 1 ..\..\Common\Minimal\semtest.c
 F21-1=- ..\..\..\Source\include\FreeRTOS.h
 F21-2=- ..\..\..\Source\include\projdefs.h
-F21-3=- Src\config\FreeRTOSConfig.h
-F21-4=- ..\..\..\Source\include\portable.h
-F21-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F21-6=- ..\..\..\Source\include\task.h
-F21-7=- ..\..\..\Source\include\list.h
-F21-8=- ..\..\Common\include\death.h
-F21-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F21-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F21-11=- src\mb96348hs.h
-F22=13 c 1 ..\..\Common\Minimal\dynamic.c
-F22-1=- ..\..\..\Source\include\FreeRTOS.h
-F22-2=- ..\..\..\Source\include\projdefs.h
-F22-3=- Src\config\FreeRTOSConfig.h
-F22-4=- ..\..\..\Source\include\portable.h
-F22-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F22-6=- ..\..\..\Source\include\task.h
-F22-7=- ..\..\..\Source\include\list.h
-F22-8=- ..\..\..\Source\include\semphr.h
-F22-9=- ..\..\..\Source\include\queue.h
-F22-10=- ..\..\Common\include\dynamic.h
-F22-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F22-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F22-13=- src\mb96348hs.h
-F23=12 c 1 ..\..\Common\Minimal\flash.c
-F23-1=- ..\..\..\Source\include\FreeRTOS.h
-F23-2=- ..\..\..\Source\include\projdefs.h
-F23-3=- Src\config\FreeRTOSConfig.h
-F23-4=- ..\..\..\Source\include\portable.h
-F23-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F23-6=- ..\..\..\Source\include\task.h
-F23-7=- ..\..\..\Source\include\list.h
-F23-8=- ..\..\Common\include\partest.h
-F23-9=- ..\..\Common\include\flash.h
-F23-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F23-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F23-12=- src\mb96348hs.h
-F24=13 c 1 ..\..\Common\Minimal\flop.c
+F21-3=- ..\..\..\Source\include\portable.h
+F21-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F21-5=- ..\..\..\Source\include\task.h
+F21-6=- ..\..\..\Source\include\list.h
+F21-7=- ..\..\..\Source\include\semphr.h
+F21-8=- ..\..\..\Source\include\queue.h
+F21-9=- ..\..\Common\include\semtest.h
+F21-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F21-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F21-12=- src\mb96348hs.h
+F21-13=- Src\FreeRTOSConfig.h
+F22=0 c 0 ..\..\..\Source\portable\MemMang\heap_1.c
+F23=0 c 0 ..\..\..\Source\portable\MemMang\heap_2.c
+F24=10 c 1 ..\..\..\Source\portable\MemMang\heap_3.c
 F24-1=- ..\..\..\Source\include\FreeRTOS.h
 F24-2=- ..\..\..\Source\include\projdefs.h
-F24-3=- Src\config\FreeRTOSConfig.h
-F24-4=- ..\..\..\Source\include\portable.h
-F24-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F24-6=- ..\..\..\Source\include\task.h
-F24-7=- ..\..\..\Source\include\list.h
-F24-8=- ..\..\Common\include\flop.h
-F24-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F24-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F24-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\math.h
-F24-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\errno.h
-F24-13=- src\mb96348hs.h
-F25=13 c 1 ..\..\Common\Minimal\GenQTest.c
+F24-3=- ..\..\..\Source\include\portable.h
+F24-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F24-5=- ..\..\..\Source\include\task.h
+F24-6=- ..\..\..\Source\include\list.h
+F24-7=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F24-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F24-9=- src\mb96348hs.h
+F24-10=- Src\FreeRTOSConfig.h
+F25=12 c 1 Src\serial\serial.c
 F25-1=- ..\..\..\Source\include\FreeRTOS.h
 F25-2=- ..\..\..\Source\include\projdefs.h
-F25-3=- Src\config\FreeRTOSConfig.h
-F25-4=- ..\..\..\Source\include\portable.h
-F25-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F25-3=- ..\..\..\Source\include\portable.h
+F25-4=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
+F25-5=- ..\..\..\Source\include\queue.h
 F25-6=- ..\..\..\Source\include\task.h
 F25-7=- ..\..\..\Source\include\list.h
-F25-8=- ..\..\..\Source\include\queue.h
-F25-9=- ..\..\..\Source\include\semphr.h
-F25-10=- ..\..\Common\include\GenQTest.h
-F25-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F25-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F25-13=- src\mb96348hs.h
-F26=11 c 1 ..\..\Common\Minimal\integer.c
-F26-1=- ..\..\..\Source\include\FreeRTOS.h
-F26-2=- ..\..\..\Source\include\projdefs.h
-F26-3=- Src\config\FreeRTOSConfig.h
+F25-8=- ..\..\Common\include\serial.h
+F25-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
+F25-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F25-11=- src\mb96348hs.h
+F25-12=- Src\FreeRTOSConfig.h
+F26=10 c 1 Src\watchdog\watchdog.c
+F26-1=- src\mb96348hs.h
+F26-2=- ..\..\..\Source\include\FreeRTOS.h
+F26-3=- ..\..\..\Source\include\projdefs.h
 F26-4=- ..\..\..\Source\include\portable.h
 F26-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
 F26-6=- ..\..\..\Source\include\task.h
 F26-7=- ..\..\..\Source\include\list.h
-F26-8=- ..\..\Common\include\integer.h
-F26-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F26-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F26-11=- src\mb96348hs.h
-F27=12 c 1 ..\..\Common\Minimal\PollQ.c
-F27-1=- ..\..\..\Source\include\FreeRTOS.h
-F27-2=- ..\..\..\Source\include\projdefs.h
-F27-3=- Src\config\FreeRTOSConfig.h
+F26-8=- Src\watchdog\watchdog.h
+F26-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F26-10=- Src\FreeRTOSConfig.h
+F27=9 c 1 Src\utility\taskutility.c
+F27-1=- src\mb96348hs.h
+F27-2=- ..\..\..\Source\include\FreeRTOS.h
+F27-3=- ..\..\..\Source\include\projdefs.h
 F27-4=- ..\..\..\Source\include\portable.h
 F27-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
 F27-6=- ..\..\..\Source\include\task.h
 F27-7=- ..\..\..\Source\include\list.h
-F27-8=- ..\..\..\Source\include\queue.h
-F27-9=- ..\..\Common\include\PollQ.h
-F27-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F27-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F27-12=- src\mb96348hs.h
-F28=13 c 1 ..\..\Common\Minimal\QPeek.c
+F27-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F27-9=- Src\FreeRTOSConfig.h
+F28=12 c 1 Src\crflash_sk16fx100mpc.c
 F28-1=- ..\..\..\Source\include\FreeRTOS.h
-F28-2=- ..\..\..\Source\include\projdefs.h
-F28-3=- Src\config\FreeRTOSConfig.h
+F28-2=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F28-3=- ..\..\..\Source\include\projdefs.h
 F28-4=- ..\..\..\Source\include\portable.h
 F28-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F28-6=- ..\..\..\Source\include\task.h
+F28-6=- ..\..\..\Source\include\croutine.h
 F28-7=- ..\..\..\Source\include\list.h
 F28-8=- ..\..\..\Source\include\queue.h
-F28-9=- ..\..\..\Source\include\semphr.h
-F28-10=- ..\..\Common\include\QPeek.h
-F28-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F28-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F28-13=- src\mb96348hs.h
-F29=13 c 1 ..\..\Common\Minimal\semtest.c
+F28-9=- ..\..\Common\include\partest.h
+F28-10=- ..\..\Common\include\crflash.h
+F28-11=- src\mb96348hs.h
+F28-12=- Src\FreeRTOSConfig.h
+F29=9 c 1 Src\partest\partest.c
 F29-1=- ..\..\..\Source\include\FreeRTOS.h
-F29-2=- ..\..\..\Source\include\projdefs.h
-F29-3=- Src\config\FreeRTOSConfig.h
+F29-2=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
+F29-3=- ..\..\..\Source\include\projdefs.h
 F29-4=- ..\..\..\Source\include\portable.h
 F29-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F29-6=- ..\..\..\Source\include\task.h
-F29-7=- ..\..\..\Source\include\list.h
-F29-8=- ..\..\..\Source\include\semphr.h
-F29-9=- ..\..\..\Source\include\queue.h
-F29-10=- ..\..\Common\include\semtest.h
-F29-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F29-12=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F29-13=- src\mb96348hs.h
-F30=0 c 0 ..\..\..\Source\portable\MemMang\heap_1.c
-F31=0 c 0 ..\..\..\Source\portable\MemMang\heap_2.c
-F32=10 c 1 ..\..\..\Source\portable\MemMang\heap_3.c
-F32-1=- ..\..\..\Source\include\FreeRTOS.h
-F32-2=- ..\..\..\Source\include\projdefs.h
-F32-3=- Src\config\FreeRTOSConfig.h
-F32-4=- ..\..\..\Source\include\portable.h
-F32-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F32-6=- ..\..\..\Source\include\task.h
-F32-7=- ..\..\..\Source\include\list.h
-F32-8=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F32-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F32-10=- src\mb96348hs.h
-F33=12 c 1 Src\serial\serial.c
-F33-1=- ..\..\..\Source\include\FreeRTOS.h
-F33-2=- ..\..\..\Source\include\projdefs.h
-F33-3=- Src\config\FreeRTOSConfig.h
-F33-4=- ..\..\..\Source\include\portable.h
-F33-5=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F33-6=- ..\..\..\Source\include\queue.h
-F33-7=- ..\..\..\Source\include\task.h
-F33-8=- ..\..\..\Source\include\list.h
-F33-9=- ..\..\Common\include\serial.h
-F33-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stdlib.h
-F33-11=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F33-12=- src\mb96348hs.h
-F34=10 c 1 Src\watchdog\watchdog.c
-F34-1=- src\mb96348hs.h
-F34-2=- ..\..\..\Source\include\FreeRTOS.h
-F34-3=- ..\..\..\Source\include\projdefs.h
-F34-4=- Src\config\FreeRTOSConfig.h
-F34-5=- ..\..\..\Source\include\portable.h
-F34-6=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F34-7=- ..\..\..\Source\include\task.h
-F34-8=- ..\..\..\Source\include\list.h
-F34-9=- Src\watchdog\watchdog.h
-F34-10=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F35=9 c 1 Src\utility\taskutility.c
-F35-1=- src\mb96348hs.h
-F35-2=- ..\..\..\Source\include\FreeRTOS.h
-F35-3=- ..\..\..\Source\include\projdefs.h
-F35-4=- Src\config\FreeRTOSConfig.h
-F35-5=- ..\..\..\Source\include\portable.h
-F35-6=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F35-7=- ..\..\..\Source\include\task.h
-F35-8=- ..\..\..\Source\include\list.h
-F35-9=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F36=12 c 1 Src\crflash_sk16fx100mpc.c
-F36-1=- ..\..\..\Source\include\FreeRTOS.h
-F36-2=- ..\..\..\..\..\..\..\devtools\Softune\LIB\907\INCLUDE\stddef.h
-F36-3=- ..\..\..\Source\include\projdefs.h
-F36-4=- Src\config\FreeRTOSConfig.h
-F36-5=- ..\..\..\Source\include\portable.h
-F36-6=- ..\..\..\Source\portable\Softune\MB96340\portmacro.h
-F36-7=- ..\..\..\Source\include\croutine.h
-F36-8=- ..\..\..\Source\include\list.h
-F36-9=- ..\..\..\Source\include\queue.h
-F36-10=- ..\..\Common\include\partest.h
-F36-11=- ..\..\Common\include\crflash.h
-F36-12=- src\mb96348hs.h
+F29-6=- src\mb96348hs.h
+F29-7=- ..\..\..\Source\include\task.h
+F29-8=- ..\..\..\Source\include\list.h
+F29-9=- Src\FreeRTOSConfig.h
 
 [BUILDMODE-STANDALONE]
 kernel=1
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opb b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opb
index c72f57e43..919b3aa3a 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opb
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opb
@@ -18,19 +18,17 @@
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\BlockQ.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\blocktim.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\comtest.obj"
--a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crhook.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\death.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\dynamic.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\flash.obj"
--a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\flop.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\GenQTest.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\integer.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\PollQ.obj"
--a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\QPeek.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\semtest.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\serial.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\watchdog.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\taskutility.obj"
 -a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crflash_sk16fx100mpc.obj"
+-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\partest.obj"
 
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opc b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opc
index 6c388afe4..922cfefc9 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opc
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opc
@@ -8,6 +8,7 @@
 -I "..\..\Common\include"
 -I "..\..\..\Source\include"
 -I "..\..\..\Source\portable\Softune\MB96340"
+-I ".\Src\utility"
 -O 4
 -K SPEED
 -model MEDIUM
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opl b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opl
index 913a28a60..221997795 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opl
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opl
@@ -37,19 +37,17 @@
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\BlockQ.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\blocktim.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\comtest.obj"
-"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crhook.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\death.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\dynamic.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\flash.obj"
-"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\flop.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\GenQTest.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\integer.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\PollQ.obj"
-"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\QPeek.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\semtest.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\serial.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\watchdog.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\taskutility.obj"
 "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crflash_sk16fx100mpc.obj"
+"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\partest.obj"
 
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
new file mode 100644
index 000000000..3c09d2efe
--- /dev/null
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
@@ -0,0 +1,108 @@
+/*
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
+
+	This file is part of the FreeRTOS.org distribution.
+
+	FreeRTOS.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	FreeRTOS.org 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
+	along with FreeRTOS.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.
+
+	***************************************************************************
+
+	Please ensure to read the configuration and relevant port sections of the 
+	online documentation.
+
+	+++ http://www.FreeRTOS.org +++
+	Documentation, latest information, license and contact details.  
+
+	+++ http://www.SafeRTOS.com +++
+	A version that is certified for use in safety critical systems.
+
+	+++ http://www.OpenRTOS.com +++
+	Commercial support, development, porting, licensing and training services.
+
+	***************************************************************************
+*/
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/* 
+ * The below define should be same as the option selected by the Memory 
+ * Model (Project->Setup Project->C Compiler->Category->Target Depend ) 
+ *
+ * Valid settings here include:
+ * ------- Memory models ---------      Data	  Code
+ * portSMALL							16 Bit    16 Bit
+ * portMEDIUM							16 Bit    24 Bit
+ * portCOMPACT							24 Bit    16 Bit
+ * portLARGE							24 Bit    24 Bit
+ */
+#define configMEMMODEL portMEDIUM
+
+/* Demo specific definition - set this to 1 if you want to include the task
+that writes trace and debug information to the UART.  This cannot be used
+when running the application using the EUROScope debugger. */
+#define INCLUDE_TraceListTasks		0
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
+ *----------------------------------------------------------*/
+#define configUSE_PREEMPTION		1
+#define configUSE_IDLE_HOOK			1
+#define configUSE_TICK_HOOK			0
+#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */
+#define configCLKP1_CLOCK_HZ		( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */
+#define configTICK_RATE_HZ			( (portTickType) 100 )
+#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )
+#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 176 )
+#define configTOTAL_HEAP_SIZE		( (size_t) (21504) )
+#define configMAX_TASK_NAME_LEN		( 20 )
+#define configUSE_TRACE_FACILITY	1
+#define configUSE_16_BIT_TICKS		1
+#define configIDLE_SHOULD_YIELD		1
+#define configUSE_MUTEXES			1
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES			1
+#define configMAX_CO_ROUTINE_PRIORITIES ( 4 )
+
+/* Set the following definitions to 1 to include the API function, or zero
+to exclude the API function. */
+#define INCLUDE_vTaskPrioritySet			1
+#define INCLUDE_uxTaskPriorityGet			1
+#define INCLUDE_vTaskDelete					1
+#define INCLUDE_vTaskCleanUpResources		1
+#define INCLUDE_vTaskSuspend				1
+#define INCLUDE_vResumeFromISR				1
+#define INCLUDE_vTaskDelayUntil				1
+#define INCLUDE_vTaskDelay					1
+#define INCLUDE_xTaskGetSchedulerState		1
+#define INCLUDE_xTaskGetCurrentTaskHandle	1
+
+
+#define configKERNEL_INTERRUPT_PRIORITY 6
+
+#endif /* FREERTOS_CONFIG_H */
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/FreeRTOSConfig.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/FreeRTOSConfig.h
deleted file mode 100644
index 3c09d2efe..000000000
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
-
-	This file is part of the FreeRTOS.org distribution.
-
-	FreeRTOS.org is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	FreeRTOS.org 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
-	along with FreeRTOS.org; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-	A special exception to the GPL can be applied should you wish to distribute
-	a combined work that includes FreeRTOS.org, without being obliged to provide
-	the source code for any proprietary components.  See the licensing section
-	of http://www.FreeRTOS.org for full details of how and when the exception
-	can be applied.
-
-	***************************************************************************
-
-	Please ensure to read the configuration and relevant port sections of the 
-	online documentation.
-
-	+++ http://www.FreeRTOS.org +++
-	Documentation, latest information, license and contact details.  
-
-	+++ http://www.SafeRTOS.com +++
-	A version that is certified for use in safety critical systems.
-
-	+++ http://www.OpenRTOS.com +++
-	Commercial support, development, porting, licensing and training services.
-
-	***************************************************************************
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-/* 
- * The below define should be same as the option selected by the Memory 
- * Model (Project->Setup Project->C Compiler->Category->Target Depend ) 
- *
- * Valid settings here include:
- * ------- Memory models ---------      Data	  Code
- * portSMALL							16 Bit    16 Bit
- * portMEDIUM							16 Bit    24 Bit
- * portCOMPACT							24 Bit    16 Bit
- * portLARGE							24 Bit    24 Bit
- */
-#define configMEMMODEL portMEDIUM
-
-/* Demo specific definition - set this to 1 if you want to include the task
-that writes trace and debug information to the UART.  This cannot be used
-when running the application using the EUROScope debugger. */
-#define INCLUDE_TraceListTasks		0
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *----------------------------------------------------------*/
-#define configUSE_PREEMPTION		1
-#define configUSE_IDLE_HOOK			1
-#define configUSE_TICK_HOOK			0
-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */
-#define configCLKP1_CLOCK_HZ		( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */
-#define configTICK_RATE_HZ			( (portTickType) 100 )
-#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )
-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 176 )
-#define configTOTAL_HEAP_SIZE		( (size_t) (21504) )
-#define configMAX_TASK_NAME_LEN		( 20 )
-#define configUSE_TRACE_FACILITY	1
-#define configUSE_16_BIT_TICKS		1
-#define configIDLE_SHOULD_YIELD		1
-#define configUSE_MUTEXES			1
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES			1
-#define configMAX_CO_ROUTINE_PRIORITIES ( 4 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet			1
-#define INCLUDE_uxTaskPriorityGet			1
-#define INCLUDE_vTaskDelete					1
-#define INCLUDE_vTaskCleanUpResources		1
-#define INCLUDE_vTaskSuspend				1
-#define INCLUDE_vResumeFromISR				1
-#define INCLUDE_vTaskDelayUntil				1
-#define INCLUDE_vTaskDelay					1
-#define INCLUDE_xTaskGetSchedulerState		1
-#define INCLUDE_xTaskGetCurrentTaskHandle	1
-
-
-#define configKERNEL_INTERRUPT_PRIORITY 6
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/config.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/config.h
deleted file mode 100644
index 78403f071..000000000
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/config/config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* THIS SAMPLE CODE IS PROVIDED AS IS AND IS SUBJECT TO ALTERATIONS. FUJITSU */
-
-/* MICROELECTRONICS ACCEPTS NO RESPONSIBILITY OR LIABILITY FOR ANY ERRORS OR */
-
-/* ELIGIBILITY FOR ANY PURPOSES.                                             */
-
-/*                 (C) Fujitsu Microelectronics Europe GmbH                  */
-
-/*---------------------------------------------------------------------------
-  config.h
-  - This file contains the defines to include or exclude a certain demo
-    application function.
-/*---------------------------------------------------------------------------*/
-
-/* The below are the defines that includes the corresponding function (those create related
- * tasks) if they are defined and vice a versa.
- */
-#define INCLUDE_StartLEDFlashTasks			1
-#define INCLUDE_StartIntegerMathTasks		1
-
-#define INCLUDE_StartPolledQueueTasks		1
-#define INCLUDE_StartSemaphoreTasks			1
-#define INCLUDE_StartBlockingQueueTasks		1
-#define INCLUDE_StartDynamicPriorityTasks	1
-
-#define INCLUDE_StartFlashCoRoutines		1
-#define INCLUDE_StartHookCoRoutines			1
-#define INCLUDE_StartGenericQueueTasks		1
-#define INCLUDE_StartQueuePeekTasks			1
-#define INCLUDE_CreateSuicidalTasks			1
-
-/* In order to have vTraceListTasks() the below define INCLUDE_TraceListTasks should be defined
- * as 1. While doing so one have to compromise on some of the other tasks as vTraceListTasks() 
- * requires high amount of memory. It should be noted that if all the task are tried to be inclued
- * then the compiler would give memory overflow error.
- */
-#if __CONFIG__ == 1
-	#define INCLUDE_AltStartComTestTasks	1
-	#define INCLUDE_StartMathTasks			0
-	#define INCLUDE_CreateBlockTimeTasks	0
-	#define INCLUDE_TraceListTasks			0
-#elif __CONFIG__ == 2
-	#define INCLUDE_AltStartComTestTasks	0
-	#define INCLUDE_StartMathTasks			0
-	#define INCLUDE_CreateBlockTimeTasks	0
-	#define INCLUDE_TraceListTasks			1
-#elif __CONFIG__ == 3
-	#define INCLUDE_AltStartComTestTasks	0
-	#define INCLUDE_StartMathTasks			0
-	#define INCLUDE_CreateBlockTimeTasks	0
-	#define INCLUDE_TraceListTasks			0
-#elif __CONFIG__ == 4
-	#define INCLUDE_AltStartComTestTasks	0
-	#define INCLUDE_StartMathTasks			0
-	#define INCLUDE_CreateBlockTimeTasks	1
-	#define INCLUDE_TraceListTasks			1
-#else
-	#define INCLUDE_AltStartComTestTasks	0
-	#define INCLUDE_StartMathTasks			0
-	#define INCLUDE_CreateBlockTimeTasks	0
-	#define INCLUDE_TraceListTasks			0
-	#error __CONFIG__ should be defined and it should have value between 1 to 4
-#endif
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
index 8a714bd71..908e5f213 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
@@ -1,5 +1,5 @@
 /*
-	FreeRTOS.org V4.7.0 - Copyright (C) 2003-2007 Richard Barry.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
 
 	This file is part of the FreeRTOS.org distribution.
 
@@ -24,13 +24,19 @@
 	can be applied.
 
 	***************************************************************************
-	See http://www.FreeRTOS.org for documentation, latest information, license
-	and contact details.  Please ensure to read the configuration and relevant
-	port sections of the online documentation.
 
-	Also see http://www.SafeRTOS.com a version that has been certified for use
-	in safety critical systems, plus commercial licensing, development and
-	support options.
+	Please ensure to read the configuration and relevant port sections of the 
+	online documentation.
+
+	+++ http://www.FreeRTOS.org +++
+	Documentation, latest information, license and contact details.  
+
+	+++ http://www.SafeRTOS.com +++
+	A version that is certified for use in safety critical systems.
+
+	+++ http://www.OpenRTOS.com +++
+	Commercial support, development, porting, licensing and training services.
+
 	***************************************************************************
 */
 
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
index 9e03536ce..ac48ae00a 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
@@ -40,24 +40,62 @@
 	***************************************************************************
 */
 
-/*---------------------------------------------------------------------------
-  MAIN.C
-  - description
-  - See README.TXT for project description and disclaimer.
-
-/*---------------------------------------------------------------------------*/
+/*
+ * Creates all the demo application tasks, then starts the scheduler.  The WEB
+ * documentation provides more details of the demo application tasks.
+ * 
+ * In addition to the standard demo tasks, the follow demo specific tasks are
+ * create:
+ *
+ * The "Check" task.  This only executes every three seconds but has the highest 
+ * priority so is guaranteed to get processor time.  Its main function is to 
+ * check that all the other tasks are still operational.  Most tasks maintain 
+ * a unique count that is incremented each time the task successfully completes 
+ * its function.  Should any error occur within such a task the count is 
+ * permanently halted.  The check task inspects the count of each task to ensure 
+ * it has changed since the last time the check task executed.  If all the count 
+ * variables have changed all the tasks are still executing error free, and the 
+ * check task toggles the onboard LED.  Should any task contain an error at any time 
+ * the LED toggle rate will change from 3 seconds to 500ms.
+ *
+ * The "Register Check" tasks.  These tasks fill the CPU registers with known
+ * values, then check that each register still contains the expected value 0 the
+ * discovery of an unexpected value being indicative of an error in the RTOS
+ * context switch mechanism.  The register check tasks operate at low priority
+ * so are switched in and out frequently.
+ *
+ * The "Trace Utility" task.  This can be used to obtain trace and debug 
+ * information via UART5.
+ */
 
-/* 16FX includes */
-#include "mb96348hs.h"
 
 /* Scheduler includes. */
 #include "FreeRTOS.h"
 #include "task.h"
 #include "semphr.h"
+
+/* Demo application includes. */
+#include "flash.h"
+#include "integer.h"
+#include "comtest2.h"
+#include "PollQ.h"
+#include "semtest.h"
+#include "BlockQ.h"
+#include "dynamic.h"
+#include "flop.h"
+#include "GenQTest.h"
+#include "QPeek.h"
+#include "BlockTim.h"
+#include "death.h"
+#include "taskutility.h"
+#include "partest.h"
+#include "crflash.h"
+#include "watchdog.h"
+
+/* Library includes. */
 #include <watchdog.h>
-#include <config.h>
 
-/*---------------------------------------------------------------------------*/
+/*-----------------------------------------------------------*/
 
 /* Demo task priorities. */
 #define WTC_TASK_PRIORITY			( tskIDLE_PRIORITY + 5 )
@@ -78,84 +116,36 @@
 top of the page.  When the system is operating error free the 'Check' task
 toggles an LED every three seconds.  If an error is discovered in any task the
 rate is increased to 500 milliseconds.  [in this case the '*' characters on the 
-LCD represent LED's]*/
+LCD represent LED's] */
 #define mainNO_ERROR_CHECK_DELAY	( (portTickType) 3000 / portTICK_RATE_MS )
 #define mainERROR_CHECK_DELAY		( (portTickType) 500 / portTICK_RATE_MS )
 
-/*---------------------------------------------------------------------------*/
-#define ledNUMBER_OF_LEDS	8
-#define mainCOM_TEST_LED	0x05
-#define mainCHECK_TEST_LED	0x07
+/* LED assignments for the demo tasks. */
+#define mainNUM_FLASH_CO_ROUTINES	8
+#define mainCOM_TEST_LED			0x05
+#define mainCHECK_TEST_LED			0x07
 
-/*---------------------------------------------------------------------------*/
+/*-----------------------------------------------------------*/
 
 /* 
  * The function that implements the Check task.  See the comments at the head
  * of the page for implementation details.
  */
-static void					vErrorChecks( void *pvParameters );
+static void	vErrorChecks( void *pvParameters );
 
 /*
  * Called by the Check task.  Returns pdPASS if all the other tasks are found
  * to be operating without error - otherwise returns pdFAIL.
  */
-static portSHORT			prvCheckOtherTasksAreStillRunning( void );
-
-/*---------------------------------------------------------------------------*/
-static unsigned portCHAR	sState[2] = { 0xFF, 0xFF };
-
-/*---------------------------------------------------------------------------
- * The below callback function is called from Tick ISR if configUSE_TICK_HOOK 
- * is configured as 1.
- *---------------------------------------------------------------------------*/
-
-/*void vApplicationTickHook ( void )
-{
-#if WATCHDOG == WTC_IN_TICK
-	Kick_Watchdog();
-#endif
-}*/
+static portSHORT prvCheckOtherTasksAreStillRunning( void );
 
-/*---------------------------------------------------------------------------
- * The below callback function is called from Delayed ISR if configUSE_IDLE_HOOK 
- * is configured as 1.
- *---------------------------------------------------------------------------*/
-void vApplicationIdleHook( void )
-{
-	#if WATCHDOG == WTC_IN_IDLE
-	Kick_Watchdog();
-	#endif
-	#if ( INCLUDE_StartFlashCoRoutines == 1 || INCLUDE_StartHookCoRoutines == 1 )
-	vCoRoutineSchedule();
-	#endif
-}
-
-/*---------------------------------------------------------------------------
- * Initialize Port 00
- *---------------------------------------------------------------------------*/
-static void prvInitPort00( void )
-{
-	DDR00 = 0xFF;
-	PDR00 = 0xFF;
-	DDR09 = 0xFF;
-	PDR09 = 0xFF;
-}
-
-/*---------------------------------------------------------------------------
- * Setup the hardware
- *---------------------------------------------------------------------------*/
-static void prvSetupHardware( void )
-{
-	prvInitPort00();
+/*
+ * Perform any hardware setup necessary for the demo.
+ */
+static void prvSetupHardware( void );
 
-	#if WATCHDOG != WTC_NONE
-	InitWatchdog();
-	#endif
-}
+/*-----------------------------------------------------------*/
 
-/*---------------------------------------------------------------------------
- * main()
- *---------------------------------------------------------------------------*/
 void main( void )
 {
 	InitIrqLevels();		/* Initialize interrupts */
@@ -168,167 +158,58 @@ void main( void )
 	#endif
 
 	/* Start the standard demo application tasks. */
-	#if ( INCLUDE_StartLEDFlashTasks == 1 )
-		vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartIntegerMathTasks == 1 )
-		vStartIntegerMathTasks( tskIDLE_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_AltStartComTestTasks == 1 )
-		vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED - 1 );
-	#endif
-
-	#if ( INCLUDE_StartPolledQueueTasks == 1 )
-		vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartSemaphoreTasks == 1 )
-		vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartBlockingQueueTasks == 1 )
-		vStartBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartDynamicPriorityTasks == 1 )
-		vStartDynamicPriorityTasks();
-	#endif
-
-	#if ( INCLUDE_StartMathTasks == 1 )
-		vStartMathTasks( tskIDLE_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartFlashCoRoutines == 1 )
-		vStartFlashCoRoutines( ledNUMBER_OF_LEDS );
-	#endif
-
-	#if ( INCLUDE_StartHookCoRoutines == 1 )
-		vStartHookCoRoutines();
-	#endif
-
-	#if ( INCLUDE_StartGenericQueueTasks == 1 )
-		vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_StartQueuePeekTasks == 1 )
-		vStartQueuePeekTasks();
-	#endif
-
-	#if ( INCLUDE_CreateBlockTimeTasks == 1 )
-		vCreateBlockTimeTasks();
-	#endif
-
-	#if ( INCLUDE_CreateSuicidalTasks == 1 )
-		vCreateSuicidalTasks( mainDEATH_PRIORITY );
-	#endif
-
-	#if ( INCLUDE_TraceListTasks == 1 )
+	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
+	vStartIntegerMathTasks( tskIDLE_PRIORITY );
+	vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED - 1 );
+	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+	vStartBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );
+	vStartDynamicPriorityTasks();
+	vStartFlashCoRoutines( mainNUM_FLASH_CO_ROUTINES );
+	vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );
+	vCreateBlockTimeTasks();
+
+	/* The definition INCLUDE_TraceListTasks is set within FreeRTOSConfig.h.
+	It should be set to 0 if using the EUROScope debugger. */
+	#if INCLUDE_TraceListTasks == 1
 		vTraceListTasks( TASK_UTILITY_PRIORITY );
 	#endif
 
 	/* Start the 'Check' task which is defined in this file. */
 	xTaskCreate( vErrorChecks, (signed portCHAR *) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
 
-	vTaskStartScheduler();
-
-	/* Should not reach here */
-	while( 1 )
-	{
-		__asm( " NOP " );	/*  //  */
-	}
+	/* The suicide tasks must be started last as they record the number of other
+	tasks that exist within the system.  The value is then used to ensure at run
+	time the number of tasks that exists is within expected bounds. */
+	vCreateSuicidalTasks( mainDEATH_PRIORITY );
+
+	/* Now start the scheduler.  Following this call the created tasks should
+	be executing. */	
+	vTaskStartScheduler( );
+	
+	/* vTaskStartScheduler() will only return if an error occurs while the 
+	idle task is being created. */
+	for( ;; );
 }
-
 /*-----------------------------------------------------------*/
-void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
-{
-	if( uxLED < ledNUMBER_OF_LEDS )
-	{
-		vTaskSuspendAll();
-
-		/* Toggle the state of the single genuine on board LED. */
-		if( (sState[0] & ((portCHAR) (1 << uxLED))) == 0 )
-		{
-			PDR09 |= ( 1 << uxLED );
-			sState[0] |= ( 1 << uxLED );
-		}
-		else
-		{
-			PDR09 &= ~( 1 << uxLED );
-			sState[0] &= ~( 1 << uxLED );
-		}
 
-		xTaskResumeAll();
-	}
-	else
-	{
-		vTaskSuspendAll();
-
-		uxLED -= ledNUMBER_OF_LEDS;
-
-		if( (sState[1] & ((portCHAR) (1 << uxLED))) == 0 )
-		{
-			PDR00 |= ( 1 << uxLED );
-			sState[1] |= ( 1 << uxLED );
-		}
-		else
-		{
-			PDR00 &= ~( 1 << uxLED );
-			sState[1] &= ~( 1 << uxLED );
-		}
-
-		xTaskResumeAll();
-	}
-}
-
-/*-----------------------------------------------------------*/
-void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
+static void prvSetupHardware( void )
 {
-	/* Set or clear the output [in this case show or hide the '*' character. */
-	if( uxLED < ledNUMBER_OF_LEDS )
-	{
-		vTaskSuspendAll();
-		{
-			if( xValue )
-			{
-				PDR09 &= ~( 1 << uxLED );
-				sState[0] &= ~( 1 << uxLED );
-			}
-			else
-			{
-				PDR09 |= ( 1 << uxLED );
-				sState[0] |= ( 1 << uxLED );
-			}
-		}
-
-		xTaskResumeAll();
-	}
-	else
-	{
-		vTaskSuspendAll();
-		{
-			if( xValue )
-			{
-				PDR00 &= ~( 1 << uxLED );
-				sState[1] &= ~( 1 << uxLED );
-			}
-			else
-			{
-				PDR00 |= ( 1 << uxLED );
-				sState[1] |= ( 1 << uxLED );
-			}
-		}
+	/* Initialise the port used by the LEDs. */
+	vParTestInitialise();
 
-		xTaskResumeAll();
-	}
+	/* See watchdog.h for definitions relating to the watchdog use. */
+	#if WATCHDOG != WTC_NONE
+		InitWatchdog();
+	#endif
 }
-
 /*-----------------------------------------------------------*/
+
 static void vErrorChecks( void *pvParameters )
 {
-	static volatile unsigned portLONG	ulDummyVariable = 3UL;
-	portTickType						xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
+portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
+
+	/* Just to remove compiler warnings. */
 	( void ) pvParameters;
 
 	/* Cycle for ever, delaying then checking all the other tasks are still
@@ -340,14 +221,6 @@ static void vErrorChecks( void *pvParameters )
 		detected the time is shortened resulting in a faster LED flash rate. */
 		vTaskDelay( xDelayPeriod );
 
-		/* Perform a bit of 32bit maths to ensure the registers used by the 
-		integer tasks get some exercise outside of the integer tasks 
-		themselves. The result here is not important we are just deliberately
-		changing registers used by other tasks to ensure that their context
-		switch is operating as required. - see the demo application 
-		documentation for more info. */
-		ulDummyVariable *= 3UL;
-
 		/* See if the other tasks are all ok. */
 		if( prvCheckOtherTasksAreStillRunning() != pdPASS )
 		{
@@ -361,8 +234,8 @@ static void vErrorChecks( void *pvParameters )
 		vParTestToggleLED( mainCHECK_TEST_LED );
 	}
 }
-
 /*-----------------------------------------------------------*/
+
 static portSHORT prvCheckOtherTasksAreStillRunning( void )
 {
 	static portSHORT	sNoErrorFound = pdTRUE;
@@ -373,98 +246,97 @@ static portSHORT prvCheckOtherTasksAreStillRunning( void )
 	incremented.  A count remaining at the same value between calls therefore
 	indicates that an error has been detected.  Only tasks that do not flash
 	an LED are checked. */
-	#if ( INCLUDE_StartIntegerMathTasks == 1 )
 	if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_AltStartComTestTasks == 1 )
 	if( xAreComTestTasksStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartPolledQueueTasks == 1 )
 	if( xArePollingQueuesStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartSemaphoreTasks == 1 )
 	if( xAreSemaphoreTasksStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartBlockingQueueTasks == 1 )
 	if( xAreBlockingQueuesStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartDynamicPriorityTasks == 1 )
 	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartMathTasks == 1 )
-	if( xAreMathsTaskStillRunning() != pdTRUE )
-	{
-		sNoErrorFound = pdFALSE;
-	}
-
-	#endif
-	#if ( INCLUDE_StartFlashCoRoutines == 1 )
 	if( xAreFlashCoRoutinesStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartHookCoRoutines == 1 )
-	if( xAreHookCoRoutinesStillRunning() != pdTRUE )
-	{
-		sNoErrorFound = pdFALSE;
-	}
-
-	#endif
-	#if ( INCLUDE_StartGenericQueueTasks == 1 )
 	if( xAreGenericQueueTasksStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_StartQueuePeekTasks == 1 )
-	if( xAreQueuePeekTasksStillRunning() != pdTRUE )
-	{
-		sNoErrorFound = pdFALSE;
-	}
-
-	#endif
-	#if ( INCLUDE_CreateBlockTimeTasks == 1 )
 	if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
-	#if ( INCLUDE_CreateSuicidalTasks == 1 )
 	if( xIsCreateTaskStillRunning() != pdTRUE )
 	{
 		sNoErrorFound = pdFALSE;
 	}
 
-	#endif
 	return sNoErrorFound;
 }
+/*-----------------------------------------------------------*/
 
-/*---------------------------------------------------------------------------*/
+/* Idle hook function. */
+#if configUSE_IDLE_HOOK == 1
+	void vApplicationIdleHook( void )
+	{
+		/* Are we using the idle task to kick the watchdog?  See watchdog.h
+		for watchdog kicking options. Note this is for demonstration only
+		and is not a suggested method of servicing the watchdog in a real
+		application. */
+		#if WATCHDOG == WTC_IN_IDLE
+			Kick_Watchdog();
+		#endif
+	}
+#else
+	#if WATCHDOG == WTC_IN_IDLE
+		#error configUSE_IDLE_HOOK must be set to 1 in FreeRTOSConfig.h if the watchdog is being cleared in the idle task hook.
+	#endif
+#endif
+
+/*-----------------------------------------------------------*/
+
+/* Tick hook function. */
+#if configUSE_TICK_HOOK == 1
+	void vApplicationTickHook( void )
+	{
+		/* Are we using the tick to kick the watchdog?  See watchdog.h
+		for watchdog kicking options.  Note this is for demonstration
+		only and is not a suggested method of servicing the watchdog in
+		a real application. */
+		#if WATCHDOG == WTC_IN_TICK
+			Kick_Watchdog();
+		#endif
+
+		vCoRoutineSchedule();
+	}
+#else
+	#if WATCHDOG == WTC_IN_TICK
+		#error configUSE_TICK_HOOK must be set to 1 in FreeRTOSConfig.h if the watchdog is being cleared in the tick hook.
+	#endif
+#endif
+/*-----------------------------------------------------------*/
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.h
new file mode 100644
index 000000000..02913cb53
--- /dev/null
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.h
@@ -0,0 +1,8 @@
+#ifndef TASK_UTILITY_H
+#define TASK_UTILITY_H
+
+/* Start the task that writes the tace information to the UART. */
+void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority );
+
+#endif
+
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/vectors.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/vectors.c
index f838cbc22..93d9644f4 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/vectors.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/vectors.c
@@ -9,7 +9,7 @@
   - Interrupt vector definition
 -----------------------------------------------------------------------------*/
 #include "mb96348hs.h"
-#include "config.h"
+#include "FreeRTOSConfig.h"
 
 /*---------------------------------------------------------------------------
    InitIrqLevels()
@@ -33,16 +33,14 @@ volatile int irq;
 		ICR = ( irq << 8 ) | DEFAULT_ILM_MASK;
 	}
 
-	ICR = ( (51 & 0xFF) << 8 ) | ( DEFAULT_ILM_MASK - 1 );			/* Reload Timer 0 of MB9634x Series */
-	ICR = ( (12 & 0xFF) << 8 ) | ( DEFAULT_ILM_MASK - 1 );			/* Delayed interrupt of 16FX Family */
+	ICR = ( (51 & 0xFF) << 8 ) | configKERNEL_INTERRUPT_PRIORITY;			/* Reload Timer 0 of MB9634x Series */
+	ICR = ( (12 & 0xFF) << 8 ) | configKERNEL_INTERRUPT_PRIORITY;			/* Delayed interrupt of 16FX Family */
 
-	#if ( INCLUDE_AltStartComTestTasks == 1 )
-		ICR = ( 79 << 8 ) | ( DEFAULT_ILM_MASK - 1 );				/* UART 0 Rx of MB9634x Series */
-		ICR = ( 80 << 8 ) | ( DEFAULT_ILM_MASK - 1 );				/* UART 0 Tx of MB9634x Series */
-	#endif
+	ICR = ( 79 << 8 ) | configKERNEL_INTERRUPT_PRIORITY;				/* UART 0 Rx of MB9634x Series */
+	ICR = ( 80 << 8 ) | configKERNEL_INTERRUPT_PRIORITY;				/* UART 0 Tx of MB9634x Series */
 
 	#if ( INCLUDE_TraceListTasks == 1 )
-		ICR = ( 81 << 8 ) | ( DEFAULT_ILM_MASK - 1 );				/* UART 1 Rx of MB9634x Series */
+		ICR = ( 81 << 8 ) | configKERNEL_INTERRUPT_PRIORITY;				/* UART 1 Rx of MB9634x Series */
 	#endif
 }
 
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/watchdog/watchdog.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/watchdog/watchdog.c
index 7d43fd017..84d5f730f 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/watchdog/watchdog.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/watchdog/watchdog.c
@@ -1,9 +1,6 @@
 /* THIS SAMPLE CODE IS PROVIDED AS IS AND IS SUBJECT TO ALTERATIONS. FUJITSU */
-
 /* MICROELECTRONICS ACCEPTS NO RESPONSIBILITY OR LIABILITY FOR ANY ERRORS OR */
-
 /* ELIGIBILITY FOR ANY PURPOSES.                                             */
-
 /*                 (C) Fujitsu Microelectronics Europe GmbH                  */
 
 /*------------------------------------------------------------------------
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/options.dat b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/options.dat
index 1616a82fd..c9ee499a3 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/options.dat
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/options.dat
@@ -11,6 +11,7 @@ $0
 -I "..\..\Common\include"
 -I "..\..\..\Source\include"
 -I "..\..\..\Source\portable\Softune\MB96340"
+-I ".\Src\utility"
 -O 4
 -K SPEED
 -model MEDIUM
@@ -25,7 +26,7 @@ $other
 -INF srcin
 -D __96340
 $time
-1202902449
+1202908049
 $end
 $1
 -g
@@ -71,7 +72,7 @@ $2
 $other
 -Xset_rora
 $time
-1202902449
+1202908772
 $end
 $3
 -dt s,d,r,a
@@ -81,7 +82,7 @@ $3
 -Xdof
 $other
 $time
-1202902449
+1202908772
 $end
 $4
 -Xdof