From: richardbarry Date: Sun, 10 Feb 2008 14:44:30 +0000 (+0000) Subject: Work in progress... X-Git-Tag: V4.7.2~57 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ba4393236e77d33cc47c8a980a6bb110c74493a;p=freertos Work in progress... git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@155 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/MB91460_Softune/91467d_FreeRTOS.prj b/Demo/MB91460_Softune/91467d_FreeRTOS.prj index ce3527164..e80b1e618 100644 --- a/Demo/MB91460_Softune/91467d_FreeRTOS.prj +++ b/Demo/MB91460_Softune/91467d_FreeRTOS.prj @@ -9,7 +9,7 @@ mode=1 CpuSerise=911 [DirInfo] -PRJ=C:\E\Dev\_FreeRTOS\Demo\MB91460_Softune\ +PRJ=C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB91460_Softune\ [PrjInfo] Count=2 @@ -92,12 +92,12 @@ F2-4=- ..\..\Source\include\portable.h F2-5=- SRC\mb91467d.h F2-6=- ..\..\Source\include\task.h F2-7=- ..\..\Source\include\list.h -F2-8=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h -F2-9=- ..\..\Source\portable\Softune\MB91460\portmacro.h +F2-8=- ..\..\Source\portable\Softune\MB91460\portmacro.h +F2-9=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F3=3 c 1 ..\..\Source\portable\Softune\MB91460\__STD_LIB_sbrk.c F3-1=- SRC\FreeRTOSConfig.h -F3-2=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h -F3-3=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h +F3-2=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h +F3-3=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F4=10 c 1 ..\..\Source\croutine.c F4-1=- ..\..\Source\include\FreeRTOS.h F4-2=- ..\..\Source\include\projdefs.h @@ -106,19 +106,19 @@ F4-4=- ..\..\Source\include\portable.h F4-5=- ..\..\Source\include\task.h F4-6=- ..\..\Source\include\list.h F4-7=- ..\..\Source\include\croutine.h -F4-8=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h -F4-9=- ..\..\Source\portable\Softune\MB91460\portmacro.h -F4-10=- SRC\mb91467d.h +F4-8=- ..\..\Source\portable\Softune\MB91460\portmacro.h +F4-9=- SRC\mb91467d.h +F4-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F5=9 c 1 ..\..\Source\list.c F5-1=- ..\..\Source\include\FreeRTOS.h F5-2=- ..\..\Source\include\projdefs.h F5-3=- SRC\FreeRTOSConfig.h F5-4=- ..\..\Source\include\portable.h F5-5=- ..\..\Source\include\list.h -F5-6=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h -F5-7=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h -F5-8=- ..\..\Source\portable\Softune\MB91460\portmacro.h -F5-9=- SRC\mb91467d.h +F5-6=- ..\..\Source\portable\Softune\MB91460\portmacro.h +F5-7=- SRC\mb91467d.h +F5-8=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h +F5-9=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F6=12 c 1 ..\..\Source\queue.c F6-1=- ..\..\Source\include\FreeRTOS.h F6-2=- ..\..\Source\include\projdefs.h @@ -129,9 +129,9 @@ F6-6=- SRC\mb91467d.h F6-7=- ..\..\Source\include\task.h F6-8=- ..\..\Source\include\list.h F6-9=- ..\..\Source\include\croutine.h -F6-10=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h -F6-11=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h -F6-12=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\string.h +F6-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h +F6-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h +F6-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\string.h F7=13 c 1 ..\..\Source\tasks.c F7-1=- ..\..\Source\include\FreeRTOS.h F7-2=- ..\..\Source\include\projdefs.h @@ -141,11 +141,11 @@ F7-5=- ..\..\Source\portable\Softune\MB91460\portmacro.h F7-6=- SRC\mb91467d.h F7-7=- ..\..\Source\include\task.h F7-8=- ..\..\Source\include\list.h -F7-9=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdio.h -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 +F7-9=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdio.h +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-1=- SRC\mb91467d.h F8-2=- SRC\vectors.h @@ -157,7 +157,7 @@ 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 +F8-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F9=2 c 1 SRC\vectors.c F9-1=- SRC\mb91467d.h F9-2=- SRC\watchdog\watchdog.h @@ -227,8 +227,8 @@ 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-11=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h -F16-12=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.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-1=- ..\..\Source\include\FreeRTOS.h F17-2=- ..\..\Source\include\projdefs.h @@ -240,7 +240,7 @@ 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-11=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h +F17-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F18=13 c 1 ..\Common\Minimal\comtest.c F18-1=- ..\..\Source\include\FreeRTOS.h F18-2=- ..\..\Source\include\projdefs.h @@ -253,8 +253,8 @@ 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 +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 F19-1=- ..\..\Source\include\FreeRTOS.h F19-2=- ..\..\..\..\..\..\..\..\SoftuneV6_32bit_REV600008\LIB\911\INCLUDE\stddef.h @@ -280,7 +280,7 @@ 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-12=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h +F20-12=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F21=11 c 1 ..\Common\Minimal\crhook.c F21-1=- ..\..\Source\include\FreeRTOS.h F21-2=- ..\..\Source\include\projdefs.h @@ -292,7 +292,7 @@ F21-7=- ..\..\Source\include\croutine.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 +F21-11=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h F22=11 c 1 ..\Common\Minimal\death.c F22-1=- ..\..\Source\include\FreeRTOS.h F22-2=- ..\..\Source\include\projdefs.h @@ -303,8 +303,8 @@ 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 +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 F23-1=- ..\..\Source\include\FreeRTOS.h F23-2=- ..\..\Source\include\projdefs.h @@ -316,9 +316,9 @@ 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=- ..\Common\Minimal\semphr.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 F24-1=- ..\..\Source\include\FreeRTOS.h F24-2=- ..\..\Source\include\projdefs.h @@ -330,8 +330,8 @@ 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 +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 F25-1=- ..\..\Source\include\FreeRTOS.h F25-2=- ..\..\Source\include\projdefs.h @@ -342,10 +342,10 @@ 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 +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 F26-1=- ..\..\Source\include\FreeRTOS.h F26-2=- ..\..\Source\include\projdefs.h @@ -357,9 +357,9 @@ 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-11=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stdlib.h -F26-12=- ..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h -F26-13=- ..\Common\Minimal\semphr.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 @@ -370,8 +370,8 @@ F27-6=- SRC\mb91467d.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 +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 @@ -383,8 +383,8 @@ 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 +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 @@ -396,9 +396,9 @@ 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=- ..\Common\Minimal\semphr.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 @@ -410,9 +410,9 @@ 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=- ..\Common\Minimal\semphr.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 @@ -422,8 +422,8 @@ 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 +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 @@ -457,8 +457,8 @@ 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 +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 @@ -469,7 +469,7 @@ 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 +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 @@ -480,7 +480,7 @@ 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 +F36-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h [BUILDMODE-STANDALONE] kernel=1 diff --git a/Demo/MB91460_Softune/SRC/MAIN.c b/Demo/MB91460_Softune/SRC/MAIN.c deleted file mode 100644 index dbb48e21e..000000000 --- a/Demo/MB91460_Softune/SRC/MAIN.c +++ /dev/null @@ -1,372 +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 */ -/*------------------------------------------------------------------------ - MAIN.C - - description - - See README.TXT for project description and disclaimer. --------------------------------------------------------------------------*/ -/*************************@INCLUDE_START************************/ -#include "mb91467d.h" -#include "vectors.h" -#include "FreeRTOS.h" -#include "task.h" -#include "watchdog.h" - -/* Demo task priorities. */ -#define WTC_TASK_PRIORITY ( tskIDLE_PRIORITY + 5 ) -#define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 4 ) -#define TASK_UTILITY_PRIORITY ( tskIDLE_PRIORITY + 3 ) -#define mainSEM_TEST_PRIORITY ( tskIDLE_PRIORITY + 3 ) -#define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 2 ) -#define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 ) -#define mainQUEUE_BLOCK_PRIORITY ( tskIDLE_PRIORITY + 2 ) -#define mainDEATH_PRIORITY ( tskIDLE_PRIORITY + 1 ) -#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 ) -#define mainGENERIC_QUEUE_PRIORITY ( tskIDLE_PRIORITY ) - -/* Baud rate used by the COM test tasks. */ -#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 19200 ) - -/* The frequency at which the 'Check' tasks executes. See the comments at the -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]*/ -#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 -/*---------------------------------------------------------------------------*/ -/* - * The function that implements the Check task. See the comments at the head - * of the page for implementation details. - */ -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 portSHORT sState[ledNUMBER_OF_LEDS] = {pdFALSE}; -static unsigned portSHORT sState1[ledNUMBER_OF_LEDS] = {pdFALSE}; - -/*--------------------------------------------------------------------------- - * 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(). - *---------------------------------------------------------------------------*/ -/*void vApplicationTickHook ( void ) -{ -#if WATCHDOG == WTC_IN_TICK - Kick_Watchdog(); -#endif -}*/ -/*--------------------------------------------------------------------------- - * 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 - - vCoRoutineSchedule(); -} - -/*--------------------------------------------------------------------------- - * Initialize Port 00 - *---------------------------------------------------------------------------*/ -static void prvInitPort( void ) -{ - DDR16=0xFF; - DDR25=0xFF; -} -/*--------------------------------------------------------------------------- - * Setup the hardware - *---------------------------------------------------------------------------*/ -static void prvSetupHardware( void ) -{ - prvInitPort(); -#if WATCHDOG != WTC_NONE - InitWatchdog(); -#endif -} - - -/*********************@FUNCTION_HEADER_START********************* -*@FUNCTION NAME: main() * -* * -*@DESCRIPTION: The main function controls the program flow * -* * -*@PARAMETER: none * -* * -*@RETURN: none * -* * -***********************@FUNCTION_HEADER_END*********************/ - -void main(void) -{ - __set_il(31); /* allow all levels */ - InitIrqLevels(); /* init interrupts */ - - prvSetupHardware(); - -#if WATCHDOG == WTC_IN_TASK - vStartWatchdogTask( WTC_TASK_PRIORITY ); -#endif - - /* Start the standard demo application tasks. */ - 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(); - - vStartMathTasks( tskIDLE_PRIORITY ); - - vStartFlashCoRoutines(ledNUMBER_OF_LEDS); - - vStartHookCoRoutines(); - - /* Start the 'Check' task which is defined in this file. */ - xTaskCreate( vErrorChecks, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); - - vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY ); - - vStartQueuePeekTasks(); - - vTraceListTasks( TASK_UTILITY_PRIORITY ); - - vCreateBlockTimeTasks(); - - vCreateSuicidalTasks( mainDEATH_PRIORITY ); - - vTaskStartScheduler( ); - - /* Should not reach here */ - while (1) - { - __asm(" NOP "); // - } -} - -/*-----------------------------------------------------------*/ -void vParTestToggleLED( unsigned portBASE_TYPE uxLED ) -{ - if (uxLED < ledNUMBER_OF_LEDS) - { - vTaskSuspendAll(); - - /* Toggle the state of the single genuine on board LED. */ - if( sState[uxLED]) - { - PDR25 |= (1 << uxLED); - } - else - { - PDR25 &= ~(1 << 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(); - } -} -/*-----------------------------------------------------------*/ -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 ) - { - vTaskSuspendAll(); - { - if( xValue ) - { - PDR25 |= (1 << uxLED); - sState[uxLED] = 1; - } - else - { - 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(); - } -} -/*-----------------------------------------------------------*/ - -static void vErrorChecks( void *pvParameters ) -{ -static volatile unsigned portLONG ulDummyVariable = 3UL; -portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY; - - /* Cycle for ever, delaying then checking all the other tasks are still - operating without error. */ - for( ;; ) - { - /* 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 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 ) - { - /* An error occurred in one of the tasks so shorten the delay - period - which has the effect of increasing the frequency of the - LED toggle. */ - xDelayPeriod = mainERROR_CHECK_DELAY; - } - - /* Flash! */ - vParTestToggleLED(mainCHECK_TEST_LED); - } -} - -/*-----------------------------------------------------------*/ - -static portSHORT prvCheckOtherTasksAreStillRunning( void ) -{ -static portSHORT sNoErrorFound = pdTRUE; - - /* The demo tasks maintain a count that increments every cycle of the task - provided that the task has never encountered an error. This function - checks the counts maintained by the tasks to ensure they are still being - 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( xAreIntegerMathsTaskStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xArePollingQueuesStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreComTestTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreSemaphoreTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreBlockingQueuesStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreDynamicPriorityTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreMathsTaskStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreFlashCoRoutinesStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreHookCoRoutinesStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xIsCreateTaskStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if ( xAreGenericQueueTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - if ( xAreQueuePeekTasksStillRunning() != pdTRUE ) - { - sNoErrorFound = pdFALSE; - } - - return sNoErrorFound; -} - -/********************@FUNCTION_DECLARATION_END******************/ diff --git a/Demo/MB91460_Softune/SRC/serial/serial.c b/Demo/MB91460_Softune/SRC/serial/serial.c index 5b400b149..4aaf19159 100644 --- a/Demo/MB91460_Softune/SRC/serial/serial.c +++ b/Demo/MB91460_Softune/SRC/serial/serial.c @@ -74,12 +74,12 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned /* Initialize UART asynchronous mode */ BGR02 = configPER_CLOCK_HZ / ulWantedBaud; - SCR02 = 0x17; /* 8N1 */ - SMR02 = 0x0d; /* enable SOT3, Reset, normal mode */ - SSR02 = 0x02; /* LSB first, enable receive interrupts */ + SCR02 = 0x17; /* 8N1 */ + SMR02 = 0x0d; /* enable SOT3, Reset, normal mode */ + SSR02 = 0x02; /* LSB first, enable receive interrupts */ - PFR20_D0 = 1; // enable UART - PFR20_D1 = 1; // enable UART + PFR20_D0 = 1; // enable UART + PFR20_D1 = 1; // enable UART EPFR20_D1 = 0; // enable UART } diff --git a/Demo/MB91460_Softune/SRC/utility/taskutility.c b/Demo/MB91460_Softune/SRC/utility/taskutility.c index 8b5a4b1a6..e381aee67 100644 --- a/Demo/MB91460_Softune/SRC/utility/taskutility.c +++ b/Demo/MB91460_Softune/SRC/utility/taskutility.c @@ -1,7 +1,7 @@ /* 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 */ +/* ELIGIBILITY FOR ANY PURPOSES. */ +/* (C) Fujitsu Microelectronics Europe GmbH */ /*------------------------------------------------------------------------ taskutility.C - @@ -28,36 +28,36 @@ void InitUart5(void) //Initialize UART asynchronous mode BGR05 = 1666; // 9600 Baud @ 16MHz - SCR05 = 0x17; // 7N2 - SMR05 = 0x0d; // enable SOT3, Reset, normal mode - SSR05 = 0x00; // LSB first + SCR05 = 0x17; // 7N2 + SMR05 = 0x0d; // enable SOT3, Reset, normal mode + SSR05 = 0x00; // LSB first - PFR19_D4 = 1; // enable UART - PFR19_D5 = 1; // enable UART + PFR19_D4 = 1; // enable UART + PFR19_D5 = 1; // enable UART //EPFR19 = 0x00; // enable UART SSR05_RIE = 1; } -void Putch5(char ch) /* sends a char */ +void Putch5(char ch) /* sends a char */ { - while (SSR05_TDRE == 0); /* wait for transmit buffer empty */ - TDR05 = ch; /* put ch into buffer */ + while (SSR05_TDRE == 0); /* wait for transmit buffer empty */ + TDR05 = ch; /* put ch into buffer */ } -char Getch5(void) /* waits for and returns incomming char */ +char Getch5(void) /* waits for and returns incomming char */ { volatile unsigned ch; while(SSR05_RDRF == 0); /* wait for data received */ - if (SSR05_ORE) /* overrun error */ + if (SSR05_ORE) /* overrun error */ { - ch = RDR05; /* reset error flags */ - return (char)(-1); + ch = RDR05; /* reset error flags */ + return (char)(-1); } else - return (RDR05); /* return char */ + return (RDR05); /* return char */ } void Puts5(const char *Name5) /* Puts a String to UART */ @@ -65,11 +65,11 @@ void Puts5(const char *Name5) /* Puts a String to UART */ volatile portSHORT i,len; len = strlen(Name5); - for (i=0; i> div)&0xF); /* get hex-digit value */ + digit = ((n >> div)&0xF); /* get hex-digit value */ Putch5(digit + ((digit < 0xA) ? '0' : 'A' - 0xA)); - div-=4; /* next digit shift */ + div-=4; /* next digit shift */ } } @@ -91,7 +91,7 @@ void Putdec5(unsigned long x, int digits) portSHORT i; portCHAR buf[10],sign=1; - if (digits < 0) { /* should be print of zero? */ + if (digits < 0) { /* should be print of zero? */ digits *= (-1); sign =1; } @@ -102,18 +102,18 @@ void Putdec5(unsigned long x, int digits) x = x/10; } - if ( sign ) - { + if ( sign ) + { for (i=0; buf[i]=='0'; i++) { /* no print of zero */ if ( i