From 913e6f0c9c4ecdeb55271657a3022db05be06092 Mon Sep 17 00:00:00 2001 From: rtel Date: Sun, 16 Feb 2014 21:47:07 +0000 Subject: [PATCH] Add event group tests to IAR LM3S demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2205 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h | 8 +- .../CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewd | 518 +++++++++++++++--- .../CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewp | 39 +- FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c | 9 + .../settings/RTOSDemo.dbgdt | 34 +- .../settings/RTOSDemo.dni | 8 +- .../settings/RTOSDemo.wsdt | 8 +- 7 files changed, 514 insertions(+), 110 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h index b49d277e0..c0ee80a7a 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. + FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -102,7 +102,7 @@ #define configQUEUE_REGISTRY_SIZE 10 /* Timer related defines. */ -#define configUSE_TIMERS 0 +#define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY 2 #define configTIMER_QUEUE_LENGTH 20 #define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 ) @@ -124,10 +124,12 @@ to exclude the API function. */ #define INCLUDE_pcTaskGetTaskName 1 #define INCLUDE_eTaskGetState 1 #define INCLUDE_xSemaphoreGetMutexHolder 1 +#define INCLUDE_eTaskGetState 1 +#define INCLUDE_xTimerPendFunctionCall 1 /* This demo makes use of one or more example stats formatting functions. These format the raw data provided by the uxTaskGetSystemState() function in to human -readable ASCII form. See the notes in the implementation of vTaskList() within +readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewd index 1f046f824..3806de74d 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewd @@ -12,7 +12,7 @@ C-SPY 2 - 23 + 26 1 1 + + + + + + + + @@ -245,6 +277,177 @@ + + CMSISDAP_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID 2 @@ -313,11 +516,215 @@ + + IJET_ID + 2 + + 3 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID 2 - 14 + 15 1 1 + @@ -635,7 +1046,7 @@ PEMICRO_ID 2 - 0 + 1 1 1 + + @@ -752,63 +1171,6 @@ - - RDIJTAGJET_ID - 0 - - 1 - 1 - 1 - - - - - - - - - - - - - - STLINK_ID 2 @@ -876,7 +1238,7 @@ XDS100_ID 2 - 1 + 2 1 1 + + + + $TOOLKIT_DIR$\plugins\middleware\HCCWare\HCCWare.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\AVIX\AVIX.ENU.ewplugin 0 @@ -929,7 +1303,7 @@ $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - 0 + 1 $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin @@ -947,6 +1321,14 @@ $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin2.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin 0 @@ -968,12 +1350,12 @@ 0 - $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin 1 - $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin - 1 + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewp index 0634e8f8a..e9c718946 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.ewp @@ -12,7 +12,7 @@ General 3 - 21 + 22 1 1 + ICCARM 2 - 28 + 30 1 1 + + AARM 2 - 8 + 9 1 1 + @@ -615,7 +632,7 @@ ILINK 0 - 15 + 16 1 1 + @@ -936,6 +957,9 @@ $PROJ_DIR$\..\Common\Minimal\death.c + + $PROJ_DIR$\..\Common\Minimal\EventGroupsDemo.c + $PROJ_DIR$\..\Common\Minimal\flash.c @@ -999,6 +1023,9 @@ $PROJ_DIR$\..\..\Source\croutine.c + + $PROJ_DIR$\..\..\Source\event_groups.c + $PROJ_DIR$\..\..\Source\portable\MemMang\heap_4.c diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c index 9546ac4ec..3e287b08f 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c @@ -150,6 +150,7 @@ and the TCP/IP stack together cannot be accommodated with the 32K size limit. */ #include "recmutex.h" #include "IntQueue.h" #include "QueueSet.h" +#include "EventGroupsDemo.h" /*-----------------------------------------------------------*/ @@ -260,6 +261,7 @@ int main( void ) vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); vStartQueuePeekTasks(); vStartQueueSetTasks(); + vStartEventGroupTasks(); /* Exclude some tasks if using the kickstart version to ensure we stay within the 32K code size limit. */ @@ -378,6 +380,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; { xMessage.pcMessage = "ERROR IN Q SET"; } + else if( xAreEventGroupTasksStillRunning() != pdTRUE ) + { + xMessage.pcMessage = "ERROR IN EVNT GRP"; + } configASSERT( strcmp( ( const char * ) xMessage.pcMessage, "PASS" ) == 0 ); @@ -389,6 +395,9 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Write to a queue that is in use as part of the queue set demo to demonstrate using queue sets from an ISR. */ vQueueSetAccessQueueSetFromISR(); + + /* Call the event group ISR tests. */ + vPeriodicEventGroupsProcessing(); } /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt index 81fb875c7..7f9f6bc31 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dbgdt @@ -3,20 +3,20 @@ - 201622 + 300201622 20 1006 268 67 - + 300Debug-LogBreakpoints - 164272727 + 148272727 @@ -28,27 +28,11 @@ 10Disassembly_I05002000 - 200100100100100 + 200100100100100300200100100100100100100100150300100100100100100100300Debug-LogBuild - - - - TabID-10465-12018 - Debug Log - Debug-Log - - - - TabID-9942-12028 - Build - Build - - - TabID-31294-227BreakpointsBreakpoints - - 0 + TabID-21213-12021 @@ -56,24 +40,24 @@ Workspace - RTOSDemoRTOSDemo/Demo filesRTOSDemo/System filesRTOSDemo/uIP files + RTOSDemoRTOSDemo/Demo filesRTOSDemo/Scheduler filesRTOSDemo/System filesRTOSDemo/uIP files - 0 + 0TabID-21977-24465DisassemblyDisassembly0TabID-19886-24505QueuesQUEUEVIEW0TabID-3889-27875Debug LogDebug-Log0 - TextEditor$WS_DIR$\main.c00000457110051100500100000010000001 + TextEditor$WS_DIR$\main.c0000024010549105490TextEditor$WS_DIR$\..\..\Source\list.c0000010960016001TextEditor$WS_DIR$\FreeRTOSConfig.h000006550705070TextEditor$WS_DIR$\..\..\Source\queue.c0000021296668166681TextEditor$WS_DIR$\..\Common\Minimal\GenQTest.c0000014981268126TextEditor$WS_DIR$\..\Common\Minimal\semtest.c000002251078910789TextEditor$WS_DIR$\..\..\Source\timers.c000005939924022TextEditor$WS_DIR$\..\Common\Minimal\EventGroupsDemo.c000002721208812088TextEditor$WS_DIR$\..\Common\Minimal\integer.c00000122636163610100000010000001 - iaridepm.enu1debuggergui.enu1-2-2740238-2-2240200142857203666142857755601-2-21981682-2-216842001002381203666142857203666 + iaridepm.enu1debuggergui.enu1-2-2542238-2-2240200142857203666142857553971-2-2542198-2-2200200119048203666119048553971-2-21981682-2-216842001002381203666119048203666196-23961682-219616842001002381203666119048203666 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni index b77749e9a..3899c2345 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.dni @@ -28,7 +28,7 @@ ByteLimit=50 [LMIFTDIDriver] LMI_ResetMode=0x00000000 [DebugChecksum] -Checksum=-1311150949 +Checksum=-658913587 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 @@ -36,6 +36,8 @@ StopOnThrow=_ 0 ShowArgs=0 [Disassembly] MixedMode=1 +[CallStackLog] +Enabled=0 [Log file] LoggingEnabled=_ 0 LogFile=_ "" @@ -43,8 +45,6 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" -[CallStackLog] -Enabled=0 [DriverProfiling] Enabled=0 Mode=0 @@ -54,7 +54,7 @@ Exclusions= [Disassemble mode] mode=1 [Breakpoints] -Bp0=_ "STD_CODE" "{$PROJ_DIR$\main.c}.489.3" 1 0 0 0 "" 0 "" +Bp0=_ "STD_CODE" "{$PROJ_DIR$\main.c}.495.3" 1 0 0 0 "" 0 "" Count=1 [Aliases] Count=0 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt index c5db75fb1..4733e6630 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/settings/RTOSDemo.wsdt @@ -14,7 +14,7 @@ 241272727 - 4826882619100726867 + 4826882619100726867201622 @@ -25,7 +25,7 @@ Workspace - RTOSDemoRTOSDemo/Demo filesRTOSDemo/Scheduler files + RTOSDemo @@ -35,14 +35,14 @@ - TextEditor$WS_DIR$\main.c00000443110051100500100000010000001 + TextEditor$WS_DIR$\main.c0000061105491054900100000010000001 - iaridepm.enu1-2-2719315-2-2200200119048203666188690734216-2-22191682-2-216842211002381225051119048203666 + iaridepm.enu1-2-2719315-2-2200200119048203666188690734216-2-22191682-2-216842211002381225051119048203666 -- 2.39.5