From 088c2d43a878fc641c636436a159b568ea7cb048 Mon Sep 17 00:00:00 2001 From: RichardBarry Date: Wed, 7 Jan 2009 12:17:19 +0000 Subject: [PATCH] Work in progress only. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@602 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h | 2 ++ .../ewp/settings/at91sam9xe-ek.dbgdt | 12 +++++----- .../ewp/settings/at91sam9xe-ek.dni | 5 ++--- Demo/ARM9_AT91SAM9XE_IAR/main.c | 22 ++++++++++++------- .../settings/rtosdemo.wsdt | 12 +++++----- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h index 77712ffdd..d513f070f 100644 --- a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h +++ b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h @@ -50,6 +50,8 @@ #ifndef FREERTOS_CONFIG_H #define FREERTOS_CONFIG_H +#include "board.h" + /*----------------------------------------------------------- * Application specific definitions. * diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt index 4bddf5882..69674d79b 100644 --- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt +++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt @@ -16,7 +16,7 @@ - 290272727 + 363272727 @@ -27,7 +27,7 @@ - + TabID-27883-8575 @@ -43,7 +43,7 @@ - 0 + 0 TabID-5864-8578 @@ -55,20 +55,20 @@ - 0 + 0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c07437723772TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c04529692976TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c017345434454344TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h06330043004TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s09840274027TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c07539133913TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c05329802980TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c020478297829TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s7905435435TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c09047914791TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c04831573157TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h01867460746711TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c079312331320100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c088377237720TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c04529692976TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c017345434454344TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h03923962396TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s09840274027TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c07539133913TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c05329802980TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c020478297829TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s7905435435TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c010448414858TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c04831573157TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h018674607467TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c07931233132TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\task.h0154506850680100000010000001 - iaridepm.enu1debuggergui.enu1-2-2740364-2-2167200119286203666261429755601-2-21981402-2-214042001002857203666119286203666 + iaridepm.enu1debuggergui.enu1-2-2740437-2-2200200119048203666261310755601-2-21981682-2-216842001002381203666119048203666 diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni index 903e2f92a..b09d95a29 100644 --- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni +++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni @@ -18,7 +18,7 @@ TriggerName=main LimitSize=0 ByteLimit=50 [DebugChecksum] -Checksum=-542088010 +Checksum=1592855699 [InstructionProfiling] Enabled=_ 0 [Log file] @@ -35,8 +35,7 @@ Graph=0 [Disassemble mode] mode=0 [Breakpoints] -Bp0=_ "STD_CODE" "{C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c}.96.2@1" 1 0 0 0 "" 0 "" 0 -Count=1 +Count=0 [TraceHelper] Enabled=0 ShowSource=1 diff --git a/Demo/ARM9_AT91SAM9XE_IAR/main.c b/Demo/ARM9_AT91SAM9XE_IAR/main.c index c2e71ec24..d8f64c3b4 100644 --- a/Demo/ARM9_AT91SAM9XE_IAR/main.c +++ b/Demo/ARM9_AT91SAM9XE_IAR/main.c @@ -96,12 +96,7 @@ int main() prvSetupHardware(); /* Start the standard demo tasks. */ - vStartLEDFlashTasks( mainLED_TASK_PRIORITY ); - - /* These tasks to be added once the simple flasher is running. - vStartIntegerMathTasks( tskIDLE_PRIORITY ); - vStartLEDFlashTasks( mainLED_TASK_PRIORITY ); vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); vStartSemaphoreTasks( mainSEM_TEST_PRIORITY ); vStartDynamicPriorityTasks(); @@ -112,9 +107,13 @@ int main() vStartQueuePeekTasks(); vStartRecursiveMutexTasks(); - The death demo tasks must be started last as the sanity checks performed - require knowledge of the number of other tasks in the system. - vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); */ + /* Create the check task - this is the task that checks all the other tasks + are executing as expected and without reporting any errors. */ + xTaskCreate( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL ); + + /* The death demo tasks must be started last as the sanity checks performed + require knowledge of the number of other tasks in the system. */ + vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); /* Start the scheduler. From this point on the execution will be under the control of the kernel. */ @@ -193,6 +192,13 @@ static volatile unsigned portLONG ulErrorCode = 0UL; { ulErrorCode |= 0x400UL; } + + if( ulErrorCode != 0x00 ) + { + xPeriod = mainERROR_PERIOD; + } + + vParTestToggleLED( LED_DS1 ); } } /*-----------------------------------------------------------*/ diff --git a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt index 2b39a9685..f197a9d4e 100644 --- a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt +++ b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt @@ -12,7 +12,7 @@ - 242272727 + 309272727 @@ -24,7 +24,7 @@ - + TabID-26777-6465 @@ -36,7 +36,7 @@ - 0 + 0 TabID-25209-6494 @@ -46,20 +46,20 @@ TabID-21317-8493Debug LogDebug-Log - 0 + 0 - TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c07437723772TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c04529692976TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c017345434454344TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h06330043004TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s09840274027TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c07539133913TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c05329802980TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c020478297829TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s7905435435TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c09047914791TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c04831573157TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h01867460746711TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c079312331320100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c088377237720TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c04529692976TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c017345434454344TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\FreeRTOSConfig.h03923962396TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s09840274027TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_lowlevel.c07539133913TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_3.c05329802980TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c020478297829TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s7905435435TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\Minimal\flash.c010448414858TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\peripherals\pit\pit.c04831573157TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board.h018674607467TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c07931233132TextEditorC:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\task.h0154506850680100000010000001 - iaridepm.enu1-2-2592332-2-2200200142857203666238571604888-2-23461402-2-214043481002857354379142857203666 + iaridepm.enu1-2-2592399-2-2240200142857203666238690604888-2-23461682-2-216843481002381354379142857203666 -- 2.39.5