From 3901585f7e94247a2716f8c044225d32f00d8304 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 14 Apr 2013 19:07:32 +0000 Subject: [PATCH] Add volatile keyword to GenQTest loop counter for consistency. Remove obsolete definition from SAM4L demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1854 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../src/config/FreeRTOSConfig.h | 1 - FreeRTOS/Demo/Common/Minimal/GenQTest.c | 2 +- FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd | 2 +- FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewp | 8 +-- .../settings/rtosdemo.cspy.bat | 2 +- .../RL78_multiple_IAR/settings/rtosdemo.dbgdt | 12 ++-- .../RL78_multiple_IAR/settings/rtosdemo.dni | 58 +++++++++--------- .../RL78_multiple_IAR/settings/rtosdemo.wsdt | 6 +- FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.suo | Bin 104960 -> 0 bytes FreeRTOS/Demo/WIN32-MSVC/WIN32.suo | Bin 65024 -> 0 bytes 10 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.suo delete mode 100644 FreeRTOS/Demo/WIN32-MSVC/WIN32.suo diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h index d14ddd2a4..195a977cb 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/config/FreeRTOSConfig.h @@ -170,7 +170,6 @@ to all Cortex-M ports, and do not rely on any particular library functions. */ header file. */ void vAssertCalled( void ); #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled(); -#define INCLUDE_MODULE_TEST 0 /* The configPRE_SLEEP_PROCESSING() and configPOST_SLEEP_PROCESSING() macros allow the application writer to add additional code before and after the MCU is diff --git a/FreeRTOS/Demo/Common/Minimal/GenQTest.c b/FreeRTOS/Demo/Common/Minimal/GenQTest.c index b306984d6..6273e0591 100644 --- a/FreeRTOS/Demo/Common/Minimal/GenQTest.c +++ b/FreeRTOS/Demo/Common/Minimal/GenQTest.c @@ -134,7 +134,7 @@ static void prvHighPriorityMutexTask( void *pvParameters ); /* Flag that will be latched to pdTRUE should any unexpected behaviour be detected in any of the tasks. */ -static portBASE_TYPE xErrorDetected = pdFALSE; +static volatile portBASE_TYPE xErrorDetected = pdFALSE; /* Counters that are incremented on each cycle of a test. This is used to detect a stalled task - a test that is no longer running. */ diff --git a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd index d0d8eedf7..075bcab69 100644 --- a/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/RL78_multiple_IAR/RTOSDemo.ewd @@ -348,7 +348,7 @@