From 27c12a2b9b873eb87e636c170c1e9e503d949e25 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Wed, 13 Feb 2008 13:32:10 +0000 Subject: [PATCH] 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 --- Demo/MB91460_Softune/91467d_FreeRTOS.prj | 64 +++++++++---------- Demo/MB91460_Softune/91467d_FreeRTOS.wsp | 2 +- Demo/MB91460_Softune/SRC/main.c | 9 +++ Demo/MB91460_Softune/SRC/partest/partest.c | 49 +++++++++++--- .../MB91460_Softune/SRC/utility/taskutility.h | 8 +++ 5 files changed, 89 insertions(+), 43 deletions(-) create mode 100644 Demo/MB91460_Softune/SRC/utility/taskutility.h diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.prj b/Demo/MB91460_Softune/91467d_FreeRTOS.prj index 4d9d63eb7..ebf664f05 100644 --- 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 F4=0 a SRC\Start91460.asm F5=0 c SRC\vectors.c -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 +F6=0 f Source Files\watchdog +F7=0 c SRC\watchdog\watchdog.c +F8=0 f Source Files\utility +F9=0 c SRC\utility\taskutility.c +F10=0 f Source Files\FreeRTOS Source +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\FreeRTOS Source\portable +F16=0 c ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c +F17=0 c ..\..\Source\portable\Softune\MB91460\port.c +F18=0 f Source Files\FreeRTOS Source\portable\MemMang +F19=0 c ..\..\Source\portable\MemMang\heap_1.c +F20=0 c ..\..\Source\portable\MemMang\heap_2.c +F21=0 c ..\..\Source\portable\MemMang\heap_3.c +F22=0 f Source Files\Demo Source +F23=0 c ..\Common\Minimal\BlockQ.c +F24=0 c ..\Common\Minimal\blocktim.c +F25=0 c ..\Common\Minimal\comtest.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 SRC\partest\partest.c +F33=0 c ..\Common\Minimal\PollQ.c +F34=0 c ..\Common\Minimal\QPeek.c +F35=0 c ..\Common\Minimal\semtest.c +F36=0 f Source Files\Demo Source\serial +F37=0 c SRC\serial\serial.c F38=0 f Include Files [OPTIONFILE] diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.wsp b/Demo/MB91460_Softune/91467d_FreeRTOS.wsp index 0a0ae7892..7052046af 100644 --- 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\ [EditState] -STATE-1=SRC\main.c:18 +STATE-1=SRC\main.c:11 Count=1 diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c index 30bcb17f2..25e1b7daa 100644 --- a/Demo/MB91460_Softune/SRC/main.c +++ b/Demo/MB91460_Softune/SRC/main.c @@ -374,7 +374,12 @@ static void prvSetupHardware( void ) 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. */ @@ -389,6 +394,10 @@ static void prvSetupHardware( void ) Kick_Watchdog(); #endif } +#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/MB91460_Softune/SRC/partest/partest.c b/Demo/MB91460_Softune/SRC/partest/partest.c index 4e7c1900b..6ea629b9f 100644 --- 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 */ -/* MICROELECTRONICS ACCEPTS NO RESPONSIBILITY OR LIABILITY FOR ANY ERRORS OR */ -/* ELIGIBILITY FOR ANY PURPOSES. */ -/* (C) Fujitsu Microelectronics Europe GmbH */ -/*------------------------------------------------------------------------ - MAIN.C - - description - - See README.TXT for project description and disclaimer. --------------------------------------------------------------------------*/ -/*************************@INCLUDE_START************************/ +/* + 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. + + *************************************************************************** +*/ /* Hardware specific includes. */ #include "mb91467d.h" diff --git a/Demo/MB91460_Softune/SRC/utility/taskutility.h b/Demo/MB91460_Softune/SRC/utility/taskutility.h new file mode 100644 index 000000000..02913cb53 --- /dev/null +++ b/Demo/MB91460_Softune/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 + -- 2.39.5