From ba4d636307918429a1da4172613d35bfeca5e7fb Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Sun, 10 Feb 2008 20:30:11 +0000
Subject: [PATCH] Update Fujitsu 32bit port - work in progress.

---
 .../MB91460_Softune/91460_template_91467d.dat |  78 ++-
 Demo/MB91460_Softune/91467d_FreeRTOS.prj      | 556 ++++++++----------
 Demo/MB91460_Softune/91467d_FreeRTOS.wsp      |   4 +-
 Demo/MB91460_Softune/SRC/FreeRTOSConfig.h     |   6 +-
 Demo/MB91460_Softune/SRC/main.c               |  96 ++-
 Demo/MB91460_Softune/SRC/partest/partest.c    |  82 +--
 .../STANDALONE/Mondeb_57K6_com1.sup           |  30 +-
 7 files changed, 404 insertions(+), 448 deletions(-)

diff --git a/Demo/MB91460_Softune/91460_template_91467d.dat b/Demo/MB91460_Softune/91460_template_91467d.dat
index 513252062..4a4439de0 100644
--- a/Demo/MB91460_Softune/91460_template_91467d.dat
+++ b/Demo/MB91460_Softune/91460_template_91467d.dat
@@ -9,23 +9,85 @@ $0
 -I "..\Common\include"
 -I "..\..\Source\include"
 -I "..\..\Source\portable\Softune\MB91460"
--O 0
+-I ".\SRC\utility"
+-O 3
+-K SIZE
 -K SHORTADDRESS
 -B
--K NOSCHEDULE
+-K SCHEDULE
 -K A1
 -K SARG
 -Xdof
 -INF STACK
 -x vTaskIncrementTick,vTaskSwitchContext
--K NOEOPT
+-K EOPT
 -K NOLIB
 -K NOUNROLL
 $other
 -Xalign
 -D__91467D
 $time
-1202156592
+1202672931
+$end
+$..\..\Source\queue.c,0
+-g
+-w 1
+-INF LIST
+-I ".\SRC"
+-I ".\SRC\watchdog"
+-I "..\Common\include"
+-I "..\..\Source\include"
+-I "..\..\Source\portable\Softune\MB91460"
+-I ".\SRC\utility"
+-O 3
+-K SIZE
+-K SHORTADDRESS
+-B
+-K SCHEDULE
+-K A1
+-K SARG
+-Xdof
+-INF STACK
+-x vTaskIncrementTick,vTaskSwitchContext
+-K EOPT
+-K NOLIB
+-K NOUNROLL
+$other
+-Xalign
+-D__91467D
+-w 0
+$time
+1202672960
+$end
+$..\..\Source\tasks.c,0
+-g
+-w 1
+-INF LIST
+-I ".\SRC"
+-I ".\SRC\watchdog"
+-I "..\Common\include"
+-I "..\..\Source\include"
+-I "..\..\Source\portable\Softune\MB91460"
+-I ".\SRC\utility"
+-O 3
+-K SIZE
+-K SHORTADDRESS
+-B
+-K SCHEDULE
+-K A1
+-K SARG
+-Xdof
+-INF STACK
+-x vTaskIncrementTick,vTaskSwitchContext
+-K EOPT
+-K NOLIB
+-K NOUNROLL
+$other
+-Xalign
+-D__91467D
+-w 0
+$time
+1202672960
 $end
 $1
 -g
@@ -71,7 +133,7 @@ $2
 -Xdof
 $other
 $time
-1201699972
+1202669532
 $end
 $3
 -dt s,d,r,a
@@ -81,7 +143,7 @@ $3
 -Xdof
 $other
 $time
-1201699972
+1202669532
 $end
 $4
 -Xdof
@@ -155,7 +217,7 @@ $2
 -Xdof
 $other
 $time
-1201109020
+1202669532
 $end
 $3
 -dt s,d,r,a
@@ -165,7 +227,7 @@ $3
 -Xdof
 $other
 $time
-1201109020
+1202669532
 $end
 $4
 -Xdof
diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.prj b/Demo/MB91460_Softune/91467d_FreeRTOS.prj
index e80b1e618..2f8885e16 100644
--- a/Demo/MB91460_Softune/91467d_FreeRTOS.prj
+++ b/Demo/MB91460_Softune/91467d_FreeRTOS.prj
@@ -18,51 +18,45 @@ PrjInfo-1=MONDEB_INTERNAL
 Active=STANDALONE
 
 [MEMBER]
-F0=44
+F0=38
 F1=0 f Source Files
-F2=0 c SRC\MAIN.c
+F2=0 c SRC\main.c
 F3=0 a SRC\mb91467d.asm
 F4=0 a SRC\Start91460.asm
 F5=0 c SRC\vectors.c
-F6=0 f Source Files\portable
-F7=0 c ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c
-F8=0 c ..\..\Source\portable\Softune\MB91460\port.c
-F9=0 f Source Files\FreeRTOS
-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\Minimal
-F15=0 c ..\Common\Minimal\AltBlckQ.c
-F16=0 c ..\Common\Minimal\AltBlock.c
-F17=0 c ..\Common\Minimal\AltPollQ.c
-F18=0 c ..\Common\Minimal\AltQTest.c
-F19=0 c ..\Common\Minimal\BlockQ.c
-F20=0 c ..\Common\Minimal\blocktim.c
-F21=0 c ..\Common\Minimal\comtest.c
-F22=0 c ..\Common\Minimal\countsem.c
-F23=0 c ..\Common\Minimal\crflash.c
-F24=0 c ..\Common\Minimal\crhook.c
-F25=0 c ..\Common\Minimal\death.c
-F26=0 c ..\Common\Minimal\dynamic.c
-F27=0 c ..\Common\Minimal\flash.c
-F28=0 c ..\Common\Minimal\flop.c
-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\QPeek.c
-F33=0 c ..\Common\Minimal\semtest.c
-F34=0 f Source Files\MemMang
-F35=0 c ..\..\Source\portable\MemMang\heap_1.c
-F36=0 c ..\..\Source\portable\MemMang\heap_2.c
-F37=0 c ..\..\Source\portable\MemMang\heap_3.c
-F38=0 f Source Files\serial
-F39=0 c SRC\serial\serial.c
-F40=0 f Source Files\watchdog
-F41=0 c SRC\watchdog\watchdog.c
-F42=0 f Source Files\utility
-F43=0 c SRC\utility\taskutility.c
-F44=0 f Include Files
+F6=0 f Source Files\FreeRTOS
+F7=0 c ..\..\Source\croutine.c
+F8=0 c ..\..\Source\list.c
+F9=0 c ..\..\Source\queue.c
+F10=0 c ..\..\Source\tasks.c
+F11=0 f Source Files\FreeRTOS\portable
+F12=0 c ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c
+F13=0 c ..\..\Source\portable\Softune\MB91460\port.c
+F14=0 f Source Files\FreeRTOS\portable\MemMang
+F15=0 c ..\..\Source\portable\MemMang\heap_1.c
+F16=0 c ..\..\Source\portable\MemMang\heap_2.c
+F17=0 c ..\..\Source\portable\MemMang\heap_3.c
+F18=0 f Source Files\serial
+F19=0 c SRC\serial\serial.c
+F20=0 f Source Files\watchdog
+F21=0 c SRC\watchdog\watchdog.c
+F22=0 f Source Files\utility
+F23=0 c SRC\utility\taskutility.c
+F24=0 f Source Files\Demo
+F25=0 c ..\Common\Minimal\BlockQ.c
+F26=0 c ..\Common\Minimal\blocktim.c
+F27=0 c ..\Common\Minimal\comtest.c
+F28=0 c ..\Common\Minimal\death.c
+F29=0 c ..\Common\Minimal\dynamic.c
+F30=0 c ..\Common\Minimal\flash.c
+F31=0 c ..\Common\Minimal\flop.c
+F32=0 c ..\Common\Minimal\GenQTest.c
+F33=0 c ..\Common\Minimal\integer.c
+F34=0 c SRC\partest\partest.c
+F35=0 c ..\Common\Minimal\PollQ.c
+F36=0 c ..\Common\Minimal\QPeek.c
+F37=0 c ..\Common\Minimal\semtest.c
+F38=0 f Include Files
 
 [OPTIONFILE]
 FILE=91460_template_91467d.dat
@@ -82,7 +76,7 @@ LST=STANDALONE\LST\
 OPT=STANDALONE\OPT\
 
 [MEMBER-STANDALONE]
-F0=36
+F0=30
 F1=0 m 1 STANDALONE\ABS\91467d_FreeRTOS.abs
 F2=9 c 1 ..\..\Source\portable\Softune\MB91460\port.c
 F2-1=- ..\..\Source\include\FreeRTOS.h
@@ -146,77 +140,78 @@ F7-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
 F7-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdarg.h
 F7-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
 F7-13=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\string.h
-F8=11 c 1 SRC\MAIN.c
+F8=2 c 1 SRC\vectors.c
 F8-1=- SRC\mb91467d.h
-F8-2=- SRC\vectors.h
-F8-3=- ..\..\Source\include\FreeRTOS.h
-F8-4=- ..\..\Source\include\projdefs.h
-F8-5=- SRC\FreeRTOSConfig.h
-F8-6=- ..\..\Source\include\portable.h
-F8-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F8-8=- ..\..\Source\include\task.h
-F8-9=- ..\..\Source\include\list.h
-F8-10=- SRC\watchdog\watchdog.h
-F8-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F9=2 c 1 SRC\vectors.c
+F8-2=- SRC\watchdog\watchdog.h
+F9=1 a 1 SRC\mb91467d.asm
 F9-1=- SRC\mb91467d.h
-F9-2=- SRC\watchdog\watchdog.h
-F10=1 a 1 SRC\mb91467d.asm
-F10-1=- SRC\mb91467d.h
-F11=0 a 1 SRC\Start91460.asm
-F12=12 c 0 ..\Common\Minimal\AltBlckQ.c
-F12-1=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
-F12-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F12-3=- ..\..\Source\include\FreeRTOS.h
-F12-4=- ..\..\Source\include\projdefs.h
-F12-5=- SRC\FreeRTOSConfig.h
-F12-6=- ..\..\Source\include\portable.h
-F12-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F12-8=- SRC\mb91467d.h
-F12-9=- ..\..\Source\include\task.h
-F12-10=- ..\..\Source\include\list.h
-F12-11=- ..\..\Source\include\queue.h
-F12-12=- ..\Common\include\AltBlckQ.h
-F13=11 c 0 ..\Common\Minimal\AltBlock.c
+F10=0 a 1 SRC\Start91460.asm
+F11=12 c 1 ..\Common\Minimal\BlockQ.c
+F11-1=- ..\..\Source\include\FreeRTOS.h
+F11-2=- ..\..\Source\include\projdefs.h
+F11-3=- SRC\FreeRTOSConfig.h
+F11-4=- ..\..\Source\include\portable.h
+F11-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F11-6=- SRC\mb91467d.h
+F11-7=- ..\..\Source\include\task.h
+F11-8=- ..\..\Source\include\list.h
+F11-9=- ..\..\Source\include\queue.h
+F11-10=- ..\Common\include\BlockQ.h
+F11-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F11-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F12=11 c 1 ..\Common\Minimal\blocktim.c
+F12-1=- ..\..\Source\include\FreeRTOS.h
+F12-2=- ..\..\Source\include\projdefs.h
+F12-3=- SRC\FreeRTOSConfig.h
+F12-4=- ..\..\Source\include\portable.h
+F12-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F12-6=- SRC\mb91467d.h
+F12-7=- ..\..\Source\include\task.h
+F12-8=- ..\..\Source\include\list.h
+F12-9=- ..\..\Source\include\queue.h
+F12-10=- ..\Common\include\blocktim.h
+F12-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F13=13 c 1 ..\Common\Minimal\comtest.c
 F13-1=- ..\..\Source\include\FreeRTOS.h
-F13-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F13-3=- ..\..\Source\include\projdefs.h
-F13-4=- SRC\FreeRTOSConfig.h
-F13-5=- ..\..\Source\include\portable.h
-F13-6=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F13-7=- SRC\mb91467d.h
-F13-8=- ..\..\Source\include\task.h
-F13-9=- ..\..\Source\include\list.h
-F13-10=- ..\..\Source\include\queue.h
-F13-11=- ..\Common\include\AltBlock.h
-F14=12 c 0 ..\Common\Minimal\AltPollQ.c
-F14-1=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
-F14-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F14-3=- ..\..\Source\include\FreeRTOS.h
-F14-4=- ..\..\Source\include\projdefs.h
-F14-5=- SRC\FreeRTOSConfig.h
-F14-6=- ..\..\Source\include\portable.h
-F14-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F14-8=- SRC\mb91467d.h
-F14-9=- ..\..\Source\include\task.h
-F14-10=- ..\..\Source\include\list.h
-F14-11=- ..\..\Source\include\queue.h
-F14-12=- ..\Common\include\AltPollQ.h
-F15=13 c 0 ..\Common\Minimal\AltQTest.c
-F15-1=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
-F15-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F15-3=- ..\..\Source\include\FreeRTOS.h
-F15-4=- ..\..\Source\include\projdefs.h
-F15-5=- SRC\FreeRTOSConfig.h
-F15-6=- ..\..\Source\include\portable.h
-F15-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F15-8=- SRC\mb91467d.h
-F15-9=- ..\..\Source\include\task.h
-F15-10=- ..\..\Source\include\list.h
-F15-11=- ..\..\Source\include\queue.h
-F15-12=- ..\..\Source\include\semphr.h
-F15-13=- ..\Common\include\AltQTest.h
-F16=12 c 1 ..\Common\Minimal\BlockQ.c
+F13-2=- ..\..\Source\include\projdefs.h
+F13-3=- SRC\FreeRTOSConfig.h
+F13-4=- ..\..\Source\include\portable.h
+F13-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F13-6=- SRC\mb91467d.h
+F13-7=- ..\..\Source\include\task.h
+F13-8=- ..\..\Source\include\list.h
+F13-9=- ..\Common\include\serial.h
+F13-10=- ..\Common\include\comtest.h
+F13-11=- ..\Common\include\partest.h
+F13-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F13-13=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F14=11 c 1 ..\Common\Minimal\death.c
+F14-1=- ..\..\Source\include\FreeRTOS.h
+F14-2=- ..\..\Source\include\projdefs.h
+F14-3=- SRC\FreeRTOSConfig.h
+F14-4=- ..\..\Source\include\portable.h
+F14-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F14-6=- SRC\mb91467d.h
+F14-7=- ..\..\Source\include\task.h
+F14-8=- ..\..\Source\include\list.h
+F14-9=- ..\Common\include\death.h
+F14-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F14-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F15=13 c 1 ..\Common\Minimal\dynamic.c
+F15-1=- ..\..\Source\include\FreeRTOS.h
+F15-2=- ..\..\Source\include\projdefs.h
+F15-3=- SRC\FreeRTOSConfig.h
+F15-4=- ..\..\Source\include\portable.h
+F15-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F15-6=- SRC\mb91467d.h
+F15-7=- ..\..\Source\include\task.h
+F15-8=- ..\..\Source\include\list.h
+F15-9=- ..\..\Source\include\queue.h
+F15-10=- ..\Common\include\dynamic.h
+F15-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F15-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F15-13=- ..\..\Source\include\semphr.h
+F16=12 c 1 ..\Common\Minimal\flash.c
 F16-1=- ..\..\Source\include\FreeRTOS.h
 F16-2=- ..\..\Source\include\projdefs.h
 F16-3=- SRC\FreeRTOSConfig.h
@@ -225,11 +220,11 @@ F16-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F16-6=- SRC\mb91467d.h
 F16-7=- ..\..\Source\include\task.h
 F16-8=- ..\..\Source\include\list.h
-F16-9=- ..\..\Source\include\queue.h
-F16-10=- ..\Common\include\BlockQ.h
+F16-9=- ..\Common\include\partest.h
+F16-10=- ..\Common\include\flash.h
 F16-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
 F16-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F17=11 c 1 ..\Common\Minimal\blocktim.c
+F17=13 c 1 ..\Common\Minimal\flop.c
 F17-1=- ..\..\Source\include\FreeRTOS.h
 F17-2=- ..\..\Source\include\projdefs.h
 F17-3=- SRC\FreeRTOSConfig.h
@@ -238,10 +233,12 @@ F17-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F17-6=- SRC\mb91467d.h
 F17-7=- ..\..\Source\include\task.h
 F17-8=- ..\..\Source\include\list.h
-F17-9=- ..\..\Source\include\queue.h
-F17-10=- ..\Common\include\blocktim.h
+F17-9=- ..\Common\include\flop.h
+F17-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
 F17-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F18=13 c 1 ..\Common\Minimal\comtest.c
+F17-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\math.h
+F17-13=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\errno.h
+F18=13 c 1 ..\Common\Minimal\GenQTest.c
 F18-1=- ..\..\Source\include\FreeRTOS.h
 F18-2=- ..\..\Source\include\projdefs.h
 F18-3=- SRC\FreeRTOSConfig.h
@@ -250,50 +247,51 @@ F18-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F18-6=- SRC\mb91467d.h
 F18-7=- ..\..\Source\include\task.h
 F18-8=- ..\..\Source\include\list.h
-F18-9=- ..\Common\include\serial.h
-F18-10=- ..\Common\include\comtest.h
-F18-11=- ..\Common\include\partest.h
-F18-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F18-13=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F19=12 c 0 ..\Common\Minimal\countsem.c
+F18-9=- ..\..\Source\include\queue.h
+F18-10=- ..\Common\include\GenQTest.h
+F18-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F18-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F18-13=- ..\..\Source\include\semphr.h
+F19=11 c 1 ..\Common\Minimal\integer.c
 F19-1=- ..\..\Source\include\FreeRTOS.h
-F19-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F19-3=- ..\..\Source\include\projdefs.h
-F19-4=- SRC\FreeRTOSConfig.h
-F19-5=- ..\..\Source\include\portable.h
-F19-6=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F19-7=- SRC\mb91467d.h
-F19-8=- ..\..\Source\include\task.h
-F19-9=- ..\..\Source\include\list.h
-F19-10=- ..\..\Source\include\semphr.h
-F19-11=- ..\..\Source\include\queue.h
-F19-12=- ..\Common\include\countsem.h
-F20=12 c 1 ..\Common\Minimal\crflash.c
+F19-2=- ..\..\Source\include\projdefs.h
+F19-3=- SRC\FreeRTOSConfig.h
+F19-4=- ..\..\Source\include\portable.h
+F19-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F19-6=- SRC\mb91467d.h
+F19-7=- ..\..\Source\include\task.h
+F19-8=- ..\..\Source\include\list.h
+F19-9=- ..\Common\include\integer.h
+F19-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F19-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F20=12 c 1 ..\Common\Minimal\PollQ.c
 F20-1=- ..\..\Source\include\FreeRTOS.h
 F20-2=- ..\..\Source\include\projdefs.h
 F20-3=- SRC\FreeRTOSConfig.h
 F20-4=- ..\..\Source\include\portable.h
 F20-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F20-6=- SRC\mb91467d.h
-F20-7=- ..\..\Source\include\croutine.h
+F20-7=- ..\..\Source\include\task.h
 F20-8=- ..\..\Source\include\list.h
 F20-9=- ..\..\Source\include\queue.h
-F20-10=- ..\Common\include\partest.h
-F20-11=- ..\Common\include\crflash.h
+F20-10=- ..\Common\include\PollQ.h
+F20-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
 F20-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F21=11 c 1 ..\Common\Minimal\crhook.c
+F21=13 c 1 ..\Common\Minimal\QPeek.c
 F21-1=- ..\..\Source\include\FreeRTOS.h
 F21-2=- ..\..\Source\include\projdefs.h
 F21-3=- SRC\FreeRTOSConfig.h
 F21-4=- ..\..\Source\include\portable.h
 F21-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F21-6=- SRC\mb91467d.h
-F21-7=- ..\..\Source\include\croutine.h
+F21-7=- ..\..\Source\include\task.h
 F21-8=- ..\..\Source\include\list.h
 F21-9=- ..\..\Source\include\queue.h
-F21-10=- ..\Common\include\crhook.h
-F21-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F22=11 c 1 ..\Common\Minimal\death.c
+F21-10=- ..\Common\include\QPeek.h
+F21-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F21-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F21-13=- ..\..\Source\include\semphr.h
+F22=13 c 1 ..\Common\Minimal\semtest.c
 F22-1=- ..\..\Source\include\FreeRTOS.h
 F22-2=- ..\..\Source\include\projdefs.h
 F22-3=- SRC\FreeRTOSConfig.h
@@ -302,10 +300,12 @@ F22-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F22-6=- SRC\mb91467d.h
 F22-7=- ..\..\Source\include\task.h
 F22-8=- ..\..\Source\include\list.h
-F22-9=- ..\Common\include\death.h
-F22-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F22-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F23=13 c 1 ..\Common\Minimal\dynamic.c
+F22-9=- ..\..\Source\include\queue.h
+F22-10=- ..\Common\include\semtest.h
+F22-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F22-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F22-13=- ..\..\Source\include\semphr.h
+F23=10 c 1 ..\..\Source\portable\MemMang\heap_3.c
 F23-1=- ..\..\Source\include\FreeRTOS.h
 F23-2=- ..\..\Source\include\projdefs.h
 F23-3=- SRC\FreeRTOSConfig.h
@@ -314,12 +314,9 @@ F23-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F23-6=- SRC\mb91467d.h
 F23-7=- ..\..\Source\include\task.h
 F23-8=- ..\..\Source\include\list.h
-F23-9=- ..\..\Source\include\queue.h
-F23-10=- ..\Common\include\dynamic.h
-F23-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F23-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F23-13=- ..\..\Source\include\semphr.h
-F24=12 c 1 ..\Common\Minimal\flash.c
+F23-9=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
+F23-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F24=10 c 0 ..\..\Source\portable\MemMang\heap_1.c
 F24-1=- ..\..\Source\include\FreeRTOS.h
 F24-2=- ..\..\Source\include\projdefs.h
 F24-3=- SRC\FreeRTOSConfig.h
@@ -328,11 +325,9 @@ F24-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F24-6=- SRC\mb91467d.h
 F24-7=- ..\..\Source\include\task.h
 F24-8=- ..\..\Source\include\list.h
-F24-9=- ..\Common\include\partest.h
-F24-10=- ..\Common\include\flash.h
-F24-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F24-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F25=13 c 1 ..\Common\Minimal\flop.c
+F24-9=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
+F24-10=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
+F25=10 c 0 ..\..\Source\portable\MemMang\heap_2.c
 F25-1=- ..\..\Source\include\FreeRTOS.h
 F25-2=- ..\..\Source\include\projdefs.h
 F25-3=- SRC\FreeRTOSConfig.h
@@ -341,146 +336,79 @@ F25-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F25-6=- SRC\mb91467d.h
 F25-7=- ..\..\Source\include\task.h
 F25-8=- ..\..\Source\include\list.h
-F25-9=- ..\Common\include\flop.h
-F25-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F25-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F25-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\math.h
-F25-13=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\errno.h
-F26=13 c 1 ..\Common\Minimal\GenQTest.c
+F25-9=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
+F25-10=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
+F26=12 c 1 SRC\serial\serial.c
 F26-1=- ..\..\Source\include\FreeRTOS.h
 F26-2=- ..\..\Source\include\projdefs.h
 F26-3=- SRC\FreeRTOSConfig.h
 F26-4=- ..\..\Source\include\portable.h
 F26-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F26-6=- SRC\mb91467d.h
-F26-7=- ..\..\Source\include\task.h
-F26-8=- ..\..\Source\include\list.h
-F26-9=- ..\..\Source\include\queue.h
-F26-10=- ..\Common\include\GenQTest.h
+F26-7=- ..\..\Source\include\queue.h
+F26-8=- ..\..\Source\include\task.h
+F26-9=- ..\..\Source\include\list.h
+F26-10=- ..\Common\include\serial.h
 F26-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
 F26-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F26-13=- ..\..\Source\include\semphr.h
-F27=11 c 1 ..\Common\Minimal\integer.c
-F27-1=- ..\..\Source\include\FreeRTOS.h
-F27-2=- ..\..\Source\include\projdefs.h
-F27-3=- SRC\FreeRTOSConfig.h
-F27-4=- ..\..\Source\include\portable.h
-F27-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F27-6=- SRC\mb91467d.h
+F27=10 c 1 SRC\watchdog\watchdog.c
+F27-1=- SRC\mb91467d.h
+F27-2=- ..\..\Source\include\FreeRTOS.h
+F27-3=- ..\..\Source\include\projdefs.h
+F27-4=- SRC\FreeRTOSConfig.h
+F27-5=- ..\..\Source\include\portable.h
+F27-6=- ..\..\Source\portable\Softune\MB91460\portmacro.h
 F27-7=- ..\..\Source\include\task.h
 F27-8=- ..\..\Source\include\list.h
-F27-9=- ..\Common\include\integer.h
-F27-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F27-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F28=12 c 1 ..\Common\Minimal\PollQ.c
-F28-1=- ..\..\Source\include\FreeRTOS.h
-F28-2=- ..\..\Source\include\projdefs.h
-F28-3=- SRC\FreeRTOSConfig.h
-F28-4=- ..\..\Source\include\portable.h
-F28-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F28-6=- SRC\mb91467d.h
-F28-7=- ..\..\Source\include\task.h
-F28-8=- ..\..\Source\include\list.h
-F28-9=- ..\..\Source\include\queue.h
-F28-10=- ..\Common\include\PollQ.h
-F28-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F28-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F29=13 c 1 ..\Common\Minimal\QPeek.c
-F29-1=- ..\..\Source\include\FreeRTOS.h
-F29-2=- ..\..\Source\include\projdefs.h
-F29-3=- SRC\FreeRTOSConfig.h
-F29-4=- ..\..\Source\include\portable.h
-F29-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F29-6=- SRC\mb91467d.h
-F29-7=- ..\..\Source\include\task.h
-F29-8=- ..\..\Source\include\list.h
-F29-9=- ..\..\Source\include\queue.h
-F29-10=- ..\Common\include\QPeek.h
-F29-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F29-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F29-13=- ..\..\Source\include\semphr.h
-F30=13 c 1 ..\Common\Minimal\semtest.c
-F30-1=- ..\..\Source\include\FreeRTOS.h
-F30-2=- ..\..\Source\include\projdefs.h
-F30-3=- SRC\FreeRTOSConfig.h
-F30-4=- ..\..\Source\include\portable.h
-F30-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F30-6=- SRC\mb91467d.h
-F30-7=- ..\..\Source\include\task.h
-F30-8=- ..\..\Source\include\list.h
-F30-9=- ..\..\Source\include\queue.h
-F30-10=- ..\Common\include\semtest.h
-F30-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F30-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F30-13=- ..\..\Source\include\semphr.h
-F31=10 c 1 ..\..\Source\portable\MemMang\heap_3.c
-F31-1=- ..\..\Source\include\FreeRTOS.h
-F31-2=- ..\..\Source\include\projdefs.h
-F31-3=- SRC\FreeRTOSConfig.h
-F31-4=- ..\..\Source\include\portable.h
-F31-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F31-6=- SRC\mb91467d.h
-F31-7=- ..\..\Source\include\task.h
-F31-8=- ..\..\Source\include\list.h
-F31-9=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F31-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F32=10 c 0 ..\..\Source\portable\MemMang\heap_1.c
-F32-1=- ..\..\Source\include\FreeRTOS.h
-F32-2=- ..\..\Source\include\projdefs.h
-F32-3=- SRC\FreeRTOSConfig.h
-F32-4=- ..\..\Source\include\portable.h
-F32-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F32-6=- SRC\mb91467d.h
-F32-7=- ..\..\Source\include\task.h
-F32-8=- ..\..\Source\include\list.h
-F32-9=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
-F32-10=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F33=10 c 0 ..\..\Source\portable\MemMang\heap_2.c
-F33-1=- ..\..\Source\include\FreeRTOS.h
-F33-2=- ..\..\Source\include\projdefs.h
-F33-3=- SRC\FreeRTOSConfig.h
-F33-4=- ..\..\Source\include\portable.h
-F33-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F33-6=- SRC\mb91467d.h
-F33-7=- ..\..\Source\include\task.h
-F33-8=- ..\..\Source\include\list.h
-F33-9=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stdlib.h
-F33-10=- ..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h
-F34=12 c 1 SRC\serial\serial.c
-F34-1=- ..\..\Source\include\FreeRTOS.h
-F34-2=- ..\..\Source\include\projdefs.h
-F34-3=- SRC\FreeRTOSConfig.h
-F34-4=- ..\..\Source\include\portable.h
-F34-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F34-6=- SRC\mb91467d.h
-F34-7=- ..\..\Source\include\queue.h
-F34-8=- ..\..\Source\include\task.h
-F34-9=- ..\..\Source\include\list.h
-F34-10=- ..\Common\include\serial.h
-F34-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h
-F34-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F35=10 c 1 SRC\watchdog\watchdog.c
-F35-1=- SRC\mb91467d.h
-F35-2=- ..\..\Source\include\FreeRTOS.h
-F35-3=- ..\..\Source\include\projdefs.h
-F35-4=- SRC\FreeRTOSConfig.h
-F35-5=- ..\..\Source\include\portable.h
-F35-6=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F35-7=- ..\..\Source\include\task.h
-F35-8=- ..\..\Source\include\list.h
-F35-9=- SRC\watchdog\watchdog.h
-F35-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
-F36=10 c 1 SRC\utility\taskutility.c
-F36-1=- SRC\mb91467d.h
-F36-2=- SRC\vectors.h
-F36-3=- ..\..\Source\include\FreeRTOS.h
-F36-4=- ..\..\Source\include\projdefs.h
-F36-5=- SRC\FreeRTOSConfig.h
-F36-6=- ..\..\Source\include\portable.h
-F36-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
-F36-8=- ..\..\Source\include\task.h
-F36-9=- ..\..\Source\include\list.h
-F36-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F27-9=- SRC\watchdog\watchdog.h
+F27-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F28=10 c 1 SRC\utility\taskutility.c
+F28-1=- SRC\mb91467d.h
+F28-2=- SRC\vectors.h
+F28-3=- ..\..\Source\include\FreeRTOS.h
+F28-4=- ..\..\Source\include\projdefs.h
+F28-5=- SRC\FreeRTOSConfig.h
+F28-6=- ..\..\Source\include\portable.h
+F28-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F28-8=- ..\..\Source\include\task.h
+F28-9=- ..\..\Source\include\list.h
+F28-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F29=25 c 1 SRC\main.c
+F29-1=- SRC\mb91467d.h
+F29-2=- SRC\vectors.h
+F29-3=- SRC\watchdog\watchdog.h
+F29-4=- ..\..\Source\include\FreeRTOS.h
+F29-5=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F29-6=- ..\..\Source\include\projdefs.h
+F29-7=- SRC\FreeRTOSConfig.h
+F29-8=- ..\..\Source\include\portable.h
+F29-9=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F29-10=- ..\..\Source\include\task.h
+F29-11=- ..\..\Source\include\list.h
+F29-12=- ..\Common\include\flash.h
+F29-13=- ..\Common\include\integer.h
+F29-14=- ..\Common\include\comtest2.h
+F29-15=- ..\Common\include\PollQ.h
+F29-16=- ..\Common\include\semtest.h
+F29-17=- ..\Common\include\BlockQ.h
+F29-18=- ..\Common\include\dynamic.h
+F29-19=- ..\Common\include\flop.h
+F29-20=- ..\Common\include\GenQTest.h
+F29-21=- ..\Common\include\QPeek.h
+F29-22=- ..\Common\include\blocktim.h
+F29-23=- ..\Common\include\death.h
+F29-24=- SRC\utility\taskutility.h
+F29-25=- ..\Common\include\partest.h
+F30=9 c 1 SRC\partest\partest.c
+F30-1=- SRC\mb91467d.h
+F30-2=- ..\..\Source\include\FreeRTOS.h
+F30-3=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
+F30-4=- ..\..\Source\include\projdefs.h
+F30-5=- SRC\FreeRTOSConfig.h
+F30-6=- ..\..\Source\include\portable.h
+F30-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
+F30-8=- ..\..\Source\include\task.h
+F30-9=- ..\..\Source\include\list.h
 
 [BUILDMODE-STANDALONE]
 kernel=1
@@ -515,7 +443,7 @@ LST=MONDEB_INTERNAL\LST\
 OPT=MONDEB_INTERNAL\OPT\
 
 [MEMBER-MONDEB_INTERNAL]
-F0=36
+F0=30
 F1=0 m 1 MONDEB_INTERNAL\ABS\91467d_FreeRTOS.abs
 F2=0 c 1 ..\..\Source\portable\Softune\MB91460\port.c
 F3=0 c 1 ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c
@@ -523,35 +451,29 @@ F4=0 c 1 ..\..\Source\croutine.c
 F5=0 c 1 ..\..\Source\list.c
 F6=0 c 1 ..\..\Source\queue.c
 F7=0 c 1 ..\..\Source\tasks.c
-F8=0 c 1 SRC\MAIN.c
-F9=0 c 1 SRC\vectors.c
-F10=0 a 1 SRC\mb91467d.asm
-F11=0 a 1 SRC\Start91460.asm
-F12=0 c 1 ..\Common\Minimal\AltBlckQ.c
-F13=0 c 1 ..\Common\Minimal\AltBlock.c
-F14=0 c 1 ..\Common\Minimal\AltPollQ.c
-F15=0 c 1 ..\Common\Minimal\AltQTest.c
-F16=0 c 1 ..\Common\Minimal\BlockQ.c
-F17=0 c 1 ..\Common\Minimal\blocktim.c
-F18=0 c 1 ..\Common\Minimal\comtest.c
-F19=0 c 1 ..\Common\Minimal\countsem.c
-F20=0 c 1 ..\Common\Minimal\crflash.c
-F21=0 c 1 ..\Common\Minimal\crhook.c
-F22=0 c 1 ..\Common\Minimal\death.c
-F23=0 c 1 ..\Common\Minimal\dynamic.c
-F24=0 c 1 ..\Common\Minimal\flash.c
-F25=0 c 1 ..\Common\Minimal\flop.c
-F26=0 c 1 ..\Common\Minimal\GenQTest.c
-F27=0 c 1 ..\Common\Minimal\integer.c
-F28=0 c 1 ..\Common\Minimal\PollQ.c
-F29=0 c 1 ..\Common\Minimal\QPeek.c
-F30=0 c 1 ..\Common\Minimal\semtest.c
-F31=0 c 1 ..\..\Source\portable\MemMang\heap_3.c
-F32=0 c 1 ..\..\Source\portable\MemMang\heap_1.c
-F33=0 c 1 ..\..\Source\portable\MemMang\heap_2.c
-F34=0 c 1 SRC\serial\serial.c
-F35=0 c 1 SRC\watchdog\watchdog.c
-F36=0 c 1 SRC\utility\taskutility.c
+F8=0 c 1 SRC\vectors.c
+F9=0 a 1 SRC\mb91467d.asm
+F10=0 a 1 SRC\Start91460.asm
+F11=0 c 1 ..\Common\Minimal\BlockQ.c
+F12=0 c 1 ..\Common\Minimal\blocktim.c
+F13=0 c 1 ..\Common\Minimal\comtest.c
+F14=0 c 1 ..\Common\Minimal\death.c
+F15=0 c 1 ..\Common\Minimal\dynamic.c
+F16=0 c 1 ..\Common\Minimal\flash.c
+F17=0 c 1 ..\Common\Minimal\flop.c
+F18=0 c 1 ..\Common\Minimal\GenQTest.c
+F19=0 c 1 ..\Common\Minimal\integer.c
+F20=0 c 1 ..\Common\Minimal\PollQ.c
+F21=0 c 1 ..\Common\Minimal\QPeek.c
+F22=0 c 1 ..\Common\Minimal\semtest.c
+F23=0 c 1 ..\..\Source\portable\MemMang\heap_3.c
+F24=0 c 1 ..\..\Source\portable\MemMang\heap_1.c
+F25=0 c 1 ..\..\Source\portable\MemMang\heap_2.c
+F26=0 c 1 SRC\serial\serial.c
+F27=0 c 1 SRC\watchdog\watchdog.c
+F28=0 c 1 SRC\utility\taskutility.c
+F29=0 c 1 SRC\main.c
+F30=0 c 1 SRC\partest\partest.c
 
 [BUILDMODE-MONDEB_INTERNAL]
 kernel=1
diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.wsp b/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
index 835079442..5d78230f7 100644
--- a/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
+++ b/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
@@ -15,9 +15,9 @@ Exec=0
 AutoLoad=1
 
 [DirInfo]
-WSP=E:\FreeRTOS\FR\91467d_FreeRTOS\91467d_FreeRTOS\Demo\MB91460_Softune\
+WSP=C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB91460_Softune\
 
 [EditState]
-STATE-1=SRC\MAIN.c:1
+STATE-1=..\..\Source\portable\Softune\MB91460\port.c:233
 Count=1
 
diff --git a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
index c6fa576bf..f5dfe2f5f 100644
--- a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
+++ b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
@@ -48,8 +48,8 @@
 
 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			1
-#define configUSE_TICK_HOOK			1
-#define configTICK_RATE_HZ			( ( portTickType ) 100 )
+#define configUSE_TICK_HOOK			0
+#define configTICK_RATE_HZ			( ( portTickType ) 1000 )
 #define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 64000000 )  /* Clock setup from start91460.asm in the demo application. */
 #define configPER_CLOCK_HZ			( ( unsigned portLONG ) 16000000 )  /* Clock setup from start91460.asm in the demo application. */
 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )
@@ -62,7 +62,7 @@
 #define configUSE_MUTEXES           1
 
 /* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 		1
+#define configUSE_CO_ROUTINES 		0
 #define configMAX_CO_ROUTINE_PRIORITIES ( 4 )
 
 
diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index d1a30ac93..4fc2662d3 100644
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -40,19 +40,18 @@
 /* Demo app includes. */
 #include "flash.h"
 #include "integer.h"
-#include "comtest.h"
+#include "comtest2.h"
 #include "PollQ.h"
 #include "semtest.h"
 #include "BlockQ.h"
 #include "dynamic.h"
 #include "flop.h"
-#include "crflash.h"
-#include "crhook.h"
 #include "GenQTest.h"
 #include "QPeek.h"
 #include "BlockTim.h"
 #include "death.h"
 #include "taskutility.h"
+#include "partest.h"
 	
 /* Demo task priorities. */
 #define mainWATCHDOG_TASK_PRIORITY		( tskIDLE_PRIORITY + 5 )
@@ -78,7 +77,7 @@ LCD represent LED's]*/
 #define mainERROR_CHECK_DELAY			( ( portTickType ) 500 / portTICK_RATE_MS  )
 
 /* The total number of LEDs available. */
-#define ledNUMBER_OF_LEDS		( 8 )
+#define mainNO_CO_ROUTINE_LEDs	( 8 )
 
 /* The first LED used by the comtest tasks. */
 #define mainCOM_TEST_LED		( 0x05 )
@@ -115,7 +114,7 @@ void main(void)
 {
 	/* Initialise the hardware ready for the demo. */	
 	prvSetupHardware();
-	
+
 	/* Start the standard demo application tasks. */
 	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );	
 	vStartIntegerMathTasks( tskIDLE_PRIORITY );
@@ -125,12 +124,10 @@ void main(void)
 	vStartBlockingQueueTasks ( mainQUEUE_BLOCK_PRIORITY );	
 	vStartDynamicPriorityTasks();	
 	vStartMathTasks( tskIDLE_PRIORITY );	
-	vStartFlashCoRoutines(ledNUMBER_OF_LEDS);	
-	vStartHookCoRoutines();
 	vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );
 	vStartQueuePeekTasks();
 	vCreateBlockTimeTasks();
-	
+
 	/* Start the 'Check' task which is defined in this file. */
 	xTaskCreate( vErrorChecks, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );	
 
@@ -160,7 +157,12 @@ void main(void)
 
 static void vErrorChecks( void *pvParameters )
 {
-portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
+portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY, xLastExecutionTime;
+
+
+	/* Initialise xLastExecutionTime so the first call to vTaskDelayUntil()
+	works correctly. */
+	xLastExecutionTime = xTaskGetTickCount();
 
 	/* Cycle for ever, delaying then checking all the other tasks are still
 	operating without error. */
@@ -169,7 +171,8 @@ portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
 		/* Wait until it is time to check again.  The time we wait here depends
 		on whether an error has been detected or not.  When an error is 
 		detected the time is shortened resulting in a faster LED flash rate. */
-		vTaskDelay( xDelayPeriod );
+		/* Perform this check every mainCHECK_DELAY milliseconds. */
+		vTaskDelayUntil( &xLastExecutionTime, xDelayPeriod );
 
 		/* See if the other tasks are all ok. */
 		if( prvCheckOtherTasksAreStillRunning() != pdPASS )
@@ -181,14 +184,14 @@ portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;
 		}
 
 		/* Flash! */
-		vParTestToggleLED(mainCHECK_TEST_LED);
+		vParTestToggleLED( mainCHECK_TEST_LED );
 	}
 }
 /*-----------------------------------------------------------*/
 
 static portSHORT prvCheckOtherTasksAreStillRunning( void )
 {
-static portBASE_TYPE xErrorOccurred = pdFALSE;
+portBASE_TYPE lReturn = pdPASS;
 
 	/* The demo tasks maintain a count that increments every cycle of the task
 	provided that the task has never encountered an error.  This function 
@@ -198,70 +201,60 @@ static portBASE_TYPE xErrorOccurred = pdFALSE;
 
 	if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 
 	if( xArePollingQueuesStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 
 	if( xAreComTestTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xAreSemaphoreTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xAreBlockingQueuesStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xAreMathsTaskStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
-	}
-	
-	if( xAreFlashCoRoutinesStillRunning() != pdTRUE ) 
-	{
-		xErrorOccurred = pdTRUE
-	}
-	
-	if( xAreHookCoRoutinesStillRunning() != pdTRUE )
-	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xIsCreateTaskStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if ( xAreGenericQueueTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
 	if ( xAreQueuePeekTasksStillRunning() != pdTRUE )
 	{
-		xErrorOccurred = pdTRUE
+		lReturn = pdFAIL;
 	}
 	
-	return sNoErrorFound;
+	return lReturn;
 }
 /*-----------------------------------------------------------*/
 
@@ -283,20 +276,6 @@ static void prvSetupHardware( void )
 }
 /*-----------------------------------------------------------*/
 
-/* The below callback function is called from Tick ISR if configUSE_TICK_HOOK 
-is configured as 1. This function needs to be uncommented if the crhook.c
-is not used, since the crhook.c has also defined vApplicationTickHook().  */  
-#if configUSE_TICK_HOOK == 1
-	void vApplicationTickHook ( void )
-	{
-		/* Are we using the tick interrupt to kick the watchdog? */
-		#if WATCHDOG == WTC_IN_TICK
-			Kick_Watchdog();
-		#endif
-	}
-#endif
-/*-----------------------------------------------------------*/
-
 /* The below callback function is called from Delayed ISR if configUSE_IDLE_HOOK 
 is configured as 1. */  
 #if configUSE_IDLE_HOOK == 1
@@ -306,7 +285,24 @@ is configured as 1. */
 		#if WATCHDOG == WTC_IN_IDLE
 			Kick_Watchdog();
 		#endif
-		
-		vCoRoutineSchedule();
+
+		#if configUSE_CO_ROUTINES == 1		
+			vCoRoutineSchedule();
+		#endif
 	}
 #endif
+
+/*
+The below callback function is called from Tick ISR if configUSE_TICK_HOOK 
+is configured as 1. */  
+#if configUSE_TICK_HOOK == 1
+	void vApplicationTickHook ( void )
+	{
+		#if WATCHDOG == WTC_IN_TICK
+			Kick_Watchdog();
+		#endif
+	}
+#endif
+
+
+
diff --git a/Demo/MB91460_Softune/SRC/partest/partest.c b/Demo/MB91460_Softune/SRC/partest/partest.c
index d741f5f4c..4e7c1900b 100644
--- a/Demo/MB91460_Softune/SRC/partest/partest.c
+++ b/Demo/MB91460_Softune/SRC/partest/partest.c
@@ -10,66 +10,48 @@
 /*************************@INCLUDE_START************************/
 
 
-/* TODO: Add comment here regarding the behaviour of the demo. */
-
 
 /* Hardware specific includes. */
 #include "mb91467d.h"
 
 /* Scheduler includes. */
 #include "FreeRTOS.h"
+#include "task.h"
 
+#define partstNUM_LEDs	8
 
-static unsigned portSHORT sState[ ledNUMBER_OF_LEDS ] = { pdFALSE };
-static unsigned portSHORT sState1[ ledNUMBER_OF_LEDS ] = { pdFALSE };
+static unsigned portSHORT sState[ partstNUM_LEDs ] = { pdFALSE };
 
 /*-----------------------------------------------------------*/
-static void vPartestInitialise( void )
+void vParTestInitialise( void )
 {
-	DDR16=0xFF;
-	DDR25=0xFF;
+	/* Set port for LED outputs. */
+	DDR16 = 0xFF;
+
+	/* Start with LEDs off. */
+	PDR25 = 0x00;
 }
 /*-----------------------------------------------------------*/
 
 void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
 {
-	if (uxLED < ledNUMBER_OF_LEDS)
+	if( uxLED < partstNUM_LEDs )
 	{
-		vTaskSuspendAll();
+		taskENTER_CRITICAL();
 		
 		/* Toggle the state of the single genuine on board LED. */
-		if( sState[uxLED])	
+		if( sState[ uxLED ])	
 		{
-			PDR25 |= (1 << uxLED);
+			PDR25 |= ( 1 << uxLED );
 		}
 		else
 		{
-			PDR25 &= ~(1 << uxLED);
+			PDR25 &= ~( 1 << uxLED );
 		}
 	
-		sState[uxLED] = !(sState[uxLED]);
+		sState[ uxLED ] = !( sState[ uxLED ] );
 		
-		xTaskResumeAll();
-	}
-	else
-	{
-		uxLED -= ledNUMBER_OF_LEDS;
-		
-		vTaskSuspendAll();
-		
-		/* Toggle the state of the single genuine on board LED. */
-		if( sState1[uxLED])	
-		{
-			PDR16 |= (1 << uxLED);
-		}
-		else
-		{
-			PDR16 &= ~(1 << uxLED);
-		}
-	
-		sState1[uxLED] = !(sState1[uxLED]);
-		
-		xTaskResumeAll();
+		taskEXIT_CRITICAL();
 	}
 }
 /*-----------------------------------------------------------*/
@@ -77,40 +59,22 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
 void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
 {
 	/* Set or clear the output [in this case show or hide the '*' character. */
-	if( uxLED < ledNUMBER_OF_LEDS )
+	if( uxLED < partstNUM_LEDs )
 	{
-		vTaskSuspendAll();
+		taskENTER_CRITICAL();
 		{
 			if( xValue )
 			{
-				PDR25 |= (1 << uxLED);
-				sState[uxLED] = 1;
+				PDR25 |= ( 1 << uxLED );
+				sState[ uxLED ] = 1;
 			}
 			else
 			{
-				PDR25 &= ~(1 << uxLED);
-				sState[uxLED] = 0;
+				PDR25 &= ~( 1 << uxLED );
+				sState[ uxLED ] = 0;
 			}
 		}
-		xTaskResumeAll();
-	}
-	else 
-	{
-		uxLED -= ledNUMBER_OF_LEDS;
-		vTaskSuspendAll();
-		{
-			if( xValue )
-			{
-				PDR16 |= (1 << uxLED);
-				sState1[uxLED] = 1;
-			}
-			else
-			{
-				PDR16 &= ~(1 << uxLED);
-				sState1[uxLED] = 0;
-			}
-		}
-		xTaskResumeAll();
+		taskEXIT_CRITICAL();
 	}
 }
 /*-----------------------------------------------------------*/
diff --git a/Demo/MB91460_Softune/STANDALONE/Mondeb_57K6_com1.sup b/Demo/MB91460_Softune/STANDALONE/Mondeb_57K6_com1.sup
index db4178e08..903e0fbcb 100644
--- a/Demo/MB91460_Softune/STANDALONE/Mondeb_57K6_com1.sup
+++ b/Demo/MB91460_Softune/STANDALONE/Mondeb_57K6_com1.sup
@@ -30,7 +30,7 @@ AssemblyState=0
 AssemblyFGColor=0 0 255
 CommandSize=132 138 958 562
 CommandState=0
-Assembly Address=H'000402F4
+Assembly Address=H'00044700
 Memory Address=H'0002F038
 Memory Mode=H'00000003
 Memory Ascii=H'00000001
@@ -98,7 +98,7 @@ MemorySize=66 69 892 493
 MemoryState=0
 Layer0=1005,
 Layer1=1004,
-Layer2=2000,SRC\Start91460.asm
+Layer2=1003,
 Source0Name=SRC\Start91460.asm
 Source0Size=110 115 936 539
 Source0State=0
@@ -107,7 +107,7 @@ Source0Mode=2
 Source1Name=..\..\Source\tasks.c
 Source1Size=204 103 1030 527
 Source1State=0
-Source1Line=2FC
+Source1Line=6AE
 Source1Mode=2
 SymbolSize=0 0 0 0
 SymbolState=0
@@ -120,19 +120,18 @@ Memory Mark Color3=0 255 0
 Memory Mark Color4=0 255 255
 Memory Mark Color5=0 128 192
 Memory Mark Color6=255 128 64
-Layer3=1007,
-Layer4=1003,
-Layer5=2000,SRC\watchdog\watchdog.c
+Layer3=2000,SRC\watchdog\watchdog.c
+Layer4=2000,..\..\Source\portable\Softune\MB91460\port.c
+Layer5=1002,
 Layer6=2000,..\..\Source\tasks.c
-Layer7=1002,
+Layer7=2000,SRC\Start91460.asm
 LocalSize=44 46 870 470
 LocalState=0
 WatchSize=0 0 826 424
 WatchState=0
-Layer8=2000,..\..\Source\portable\Softune\MB91460\port.c
 Source2Name=..\..\Source\portable\Softune\MB91460\port.c
 Source2Size=0 0 826 424
-Source2State=2
+Source2State=0
 Source2Line=2D
 Source2Mode=2
 Source3Name=SRC\watchdog\watchdog.c
@@ -140,6 +139,19 @@ Source3Size=0 0 938 522
 Source3State=0
 Source3Line=24
 Source3Mode=2
+Source4Name=SRC\main.c
+Source4Size=66 69 1074 448
+Source4State=0
+Source4Line=6A
+Source4Mode=2
+Layer8=2000,SRC\main.c
+Layer9=1007,
+Layer10=2000,..\Common\Minimal\semtest.c
+Source5Name=..\Common\Minimal\semtest.c
+Source5Size=22 23 976 398
+Source5State=0
+Source5Line=C8
+Source5Mode=2
 [Path Environment]
 Flag=Enable
 Source=