Add the event group interrupt tests to the Win32 demo projects.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2158 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
index 2860a25c7450697913067ca81b9c39ce4b45c8e8..c5042b7ec1c09ed997856700fda531a940d6229a 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -117,7 +117,7 @@ void vConfigureTimerForRunTimeStats( void );
 \r
 /* This demo makes use of one or more example stats formatting functions.  These\r
 format the raw data provided by the uxTaskGetSystemState() function in to human\r
-readable ASCII form.  See the notes in the implementation of vTaskList() within \r
+readable ASCII form.  See the notes in the implementation of vTaskList() within\r
 FreeRTOS/Source/tasks.c for limitations. */\r
 #define configUSE_STATS_FORMATTING_FUNCTIONS   1\r
 \r
@@ -137,13 +137,13 @@ to exclude the API function. */
 #define INCLUDE_pcTaskGetTaskName                              1\r
 #define INCLUDE_eTaskGetState                                  1\r
 #define INCLUDE_xSemaphoreGetMutexHolder               1\r
-#define INCLUDE_xTimerPendCallbackFromISR              1\r
+#define INCLUDE_xTimerPendFunctionCallFromISR  1\r
 \r
 /* Standard assert semantics. */\r
 extern void vAssertCalled( unsigned long ulLine, const char * const pcFileName );\r
 #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __LINE__, __FILE__ )\r
 \r
-/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC \r
+/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC\r
 version of the Win32 simulator projects.  It will be ignored in the GCC\r
 version. */\r
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index 0164a52c6e5857725a2d435e564977fb16844457..d7ac74fc8d136a4397e96c12fc2b6da8a0787977 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
@@ -402,6 +402,9 @@ void vFullDemoTickHookFunction( void )
        /* Write to a queue that is in use as part of the queue set demo to\r
        demonstrate using queue sets from an ISR. */\r
        vQueueSetAccessQueueSetFromISR();\r
+\r
+       /* Exercise event groups from interrupts. */\r
+       vPeriodicEventGroupsProcessing();\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
index 1935f454bdf351d69acf20eae31ae4f1e1f931eb..ad1a5b7e74362e900c6a5dfcf9e8ed91e00d4e82 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -134,13 +134,13 @@ to exclude the API function. */
 #define INCLUDE_pcTaskGetTaskName                              1\r
 #define INCLUDE_eTaskGetState                                  1\r
 #define INCLUDE_xSemaphoreGetMutexHolder               1\r
-#define INCLUDE_xTimerPendCallbackFromISR              1\r
+#define INCLUDE_xTimerPendFunctionCallFromISR  1\r
 \r
 /* Standard assert semantics. */\r
 extern void vAssertCalled( unsigned long ulLine, const char * const pcFileName );\r
 #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __LINE__, __FILE__ )\r
 \r
-/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC \r
+/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC\r
 version of the Win32 simulator projects.  It will be ignored in the GCC\r
 version. */\r
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1\r