Continue to tidy up the Fujitsu ports.

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

diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.prj b/Demo/MB91460_Softune/91467d_FreeRTOS.prj
index 4d9d63eb7111c0241053b2448710b19ceeab162e..ebf664f057674bc4718d2ba76c6cf66b300c7d74 100644 (file)
--- a/Demo/MB91460_Softune/91467d_FreeRTOS.prj
+++ b/Demo/MB91460_Softune/91467d_FreeRTOS.prj
@@ -24,38 +24,38 @@ F2=0 c SRC\main.c
 F3=0 a SRC\mb91467d.asm\r
 F4=0 a SRC\Start91460.asm\r
 F5=0 c SRC\vectors.c\r
-F6=0 f Source Files\FreeRTOS\r
-F7=0 c ..\..\Source\croutine.c\r
-F8=0 c ..\..\Source\list.c\r
-F9=0 c ..\..\Source\queue.c\r
-F10=0 c ..\..\Source\tasks.c\r
-F11=0 f Source Files\FreeRTOS\portable\r
-F12=0 c ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c\r
-F13=0 c ..\..\Source\portable\Softune\MB91460\port.c\r
-F14=0 f Source Files\FreeRTOS\portable\MemMang\r
-F15=0 c ..\..\Source\portable\MemMang\heap_1.c\r
-F16=0 c ..\..\Source\portable\MemMang\heap_2.c\r
-F17=0 c ..\..\Source\portable\MemMang\heap_3.c\r
-F18=0 f Source Files\serial\r
-F19=0 c SRC\serial\serial.c\r
-F20=0 f Source Files\watchdog\r
-F21=0 c SRC\watchdog\watchdog.c\r
-F22=0 f Source Files\utility\r
-F23=0 c SRC\utility\taskutility.c\r
-F24=0 f Source Files\Demo\r
-F25=0 c ..\Common\Minimal\BlockQ.c\r
-F26=0 c ..\Common\Minimal\blocktim.c\r
-F27=0 c ..\Common\Minimal\comtest.c\r
-F28=0 c ..\Common\Minimal\death.c\r
-F29=0 c ..\Common\Minimal\dynamic.c\r
-F30=0 c ..\Common\Minimal\flash.c\r
-F31=0 c ..\Common\Minimal\flop.c\r
-F32=0 c ..\Common\Minimal\GenQTest.c\r
-F33=0 c ..\Common\Minimal\integer.c\r
-F34=0 c SRC\partest\partest.c\r
-F35=0 c ..\Common\Minimal\PollQ.c\r
-F36=0 c ..\Common\Minimal\QPeek.c\r
-F37=0 c ..\Common\Minimal\semtest.c\r
+F6=0 f Source Files\watchdog\r
+F7=0 c SRC\watchdog\watchdog.c\r
+F8=0 f Source Files\utility\r
+F9=0 c SRC\utility\taskutility.c\r
+F10=0 f Source Files\FreeRTOS Source\r
+F11=0 c ..\..\Source\croutine.c\r
+F12=0 c ..\..\Source\list.c\r
+F13=0 c ..\..\Source\queue.c\r
+F14=0 c ..\..\Source\tasks.c\r
+F15=0 f Source Files\FreeRTOS Source\portable\r
+F16=0 c ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c\r
+F17=0 c ..\..\Source\portable\Softune\MB91460\port.c\r
+F18=0 f Source Files\FreeRTOS Source\portable\MemMang\r
+F19=0 c ..\..\Source\portable\MemMang\heap_1.c\r
+F20=0 c ..\..\Source\portable\MemMang\heap_2.c\r
+F21=0 c ..\..\Source\portable\MemMang\heap_3.c\r
+F22=0 f Source Files\Demo Source\r
+F23=0 c ..\Common\Minimal\BlockQ.c\r
+F24=0 c ..\Common\Minimal\blocktim.c\r
+F25=0 c ..\Common\Minimal\comtest.c\r
+F26=0 c ..\Common\Minimal\death.c\r
+F27=0 c ..\Common\Minimal\dynamic.c\r
+F28=0 c ..\Common\Minimal\flash.c\r
+F29=0 c ..\Common\Minimal\flop.c\r
+F30=0 c ..\Common\Minimal\GenQTest.c\r
+F31=0 c ..\Common\Minimal\integer.c\r
+F32=0 c SRC\partest\partest.c\r
+F33=0 c ..\Common\Minimal\PollQ.c\r
+F34=0 c ..\Common\Minimal\QPeek.c\r
+F35=0 c ..\Common\Minimal\semtest.c\r
+F36=0 f Source Files\Demo Source\serial\r
+F37=0 c SRC\serial\serial.c\r
 F38=0 f Include Files\r
 \r
 [OPTIONFILE]\r

diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.wsp b/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
index 0a0ae7892ec4d173e728a014637c350a0edf3b58..7052046af44366a525a5a96395e0ffad1088fe94 100644 (file)
--- a/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
+++ b/Demo/MB91460_Softune/91467d_FreeRTOS.wsp
@@ -18,6 +18,6 @@ AutoLoad=1
 WSP=C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB91460_Softune\\r
 \r
 [EditState]\r
-STATE-1=SRC\main.c:18\r
+STATE-1=SRC\main.c:11\r
 Count=1\r
 \r

diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index 30bcb17f29c6825b70707ff29995555839a806bf..25e1b7daaa615b37dbc0d7ac431e04c7c16248e7 100644 (file)
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -374,7 +374,12 @@ static void prvSetupHardware( void )
                        Kick_Watchdog();\r
                #endif\r
        }\r
+#else\r
+       #if WATCHDOG == WTC_IN_IDLE\r
+               #error configUSE_IDLE_HOOK must be set to 1 in FreeRTOSConfig.h if the watchdog is being cleared in the idle task hook.\r
+       #endif\r
 #endif\r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Tick hook function. */\r
@@ -389,6 +394,10 @@ static void prvSetupHardware( void )
                        Kick_Watchdog();\r
                #endif\r
        }\r
+#else\r
+       #if WATCHDOG == WTC_IN_TICK\r
+               #error configUSE_TICK_HOOK must be set to 1 in FreeRTOSConfig.h if the watchdog is being cleared in the tick hook.\r
+       #endif\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/MB91460_Softune/SRC/partest/partest.c b/Demo/MB91460_Softune/SRC/partest/partest.c
index 4e7c1900be1d6a5815c00133e2e4eb27addac2a3..6ea629b9f8820de7fb1b8f50e5eb3963f7cf4056 100644 (file)
--- a/Demo/MB91460_Softune/SRC/partest/partest.c
+++ b/Demo/MB91460_Softune/SRC/partest/partest.c
@@ -1,15 +1,44 @@
-/* THIS SAMPLE CODE IS PROVIDED AS IS AND IS SUBJECT TO ALTERATIONS. FUJITSU */\r
-/* MICROELECTRONICS ACCEPTS NO RESPONSIBILITY OR LIABILITY FOR ANY ERRORS OR */\r
-/* ELIGIBILITY FOR ANY PURPOSES.                                                                                        */\r
-/*                              (C) Fujitsu Microelectronics Europe GmbH                                 */\r
-/*------------------------------------------------------------------------\r
-  MAIN.C\r
-  - description\r
-  - See README.TXT for project description and disclaimer.\r
--------------------------------------------------------------------------*/\r
-/*************************@INCLUDE_START************************/\r
+/*\r
+       FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.\r
 \r
+       This file is part of the FreeRTOS.org distribution.\r
 \r
+       FreeRTOS.org is free software; you can redistribute it and/or modify\r
+       it under the terms of the GNU General Public License as published by\r
+       the Free Software Foundation; either version 2 of the License, or\r
+       (at your option) any later version.\r
+\r
+       FreeRTOS.org is distributed in the hope that it will be useful,\r
+       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+       GNU General Public License for more details.\r
+\r
+       You should have received a copy of the GNU General Public License\r
+       along with FreeRTOS.org; if not, write to the Free Software\r
+       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+\r
+       A special exception to the GPL can be applied should you wish to distribute\r
+       a combined work that includes FreeRTOS.org, without being obliged to provide\r
+       the source code for any proprietary components.  See the licensing section\r
+       of http://www.FreeRTOS.org for full details of how and when the exception\r
+       can be applied.\r
+\r
+       ***************************************************************************\r
+\r
+       Please ensure to read the configuration and relevant port sections of the \r
+       online documentation.\r
+\r
+       +++ http://www.FreeRTOS.org +++\r
+       Documentation, latest information, license and contact details.  \r
+\r
+       +++ http://www.SafeRTOS.com +++\r
+       A version that is certified for use in safety critical systems.\r
+\r
+       +++ http://www.OpenRTOS.com +++\r
+       Commercial support, development, porting, licensing and training services.\r
+\r
+       ***************************************************************************\r
+*/\r
 \r
 /* Hardware specific includes. */\r
 #include "mb91467d.h"\r

diff --git a/Demo/MB91460_Softune/SRC/utility/taskutility.h b/Demo/MB91460_Softune/SRC/utility/taskutility.h
new file mode 100644 (file)
index 0000000..02913cb
--- /dev/null
+++ b/Demo/MB91460_Softune/SRC/utility/taskutility.h
@@ -0,0 +1,8 @@
+#ifndef TASK_UTILITY_H\r
+#define TASK_UTILITY_H\r
+\r
+/* Start the task that writes the tace information to the UART. */\r
+void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority );\r
+\r
+#endif\r
+\r