From 031a34e11aa537d794a6d654673511dfbbbae6fc Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 31 Dec 2013 19:10:11 +0000 Subject: [PATCH] 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 --- FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h | 8 ++++---- FreeRTOS/Demo/WIN32-MSVC/main_full.c | 3 +++ FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h index 2860a25c7..c5042b7ec 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. + FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -117,7 +117,7 @@ void vConfigureTimerForRunTimeStats( void ); /* 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 @@ -137,13 +137,13 @@ to exclude the API function. */ #define INCLUDE_pcTaskGetTaskName 1 #define INCLUDE_eTaskGetState 1 #define INCLUDE_xSemaphoreGetMutexHolder 1 -#define INCLUDE_xTimerPendCallbackFromISR 1 +#define INCLUDE_xTimerPendFunctionCallFromISR 1 /* Standard assert semantics. */ extern void vAssertCalled( unsigned long ulLine, const char * const pcFileName ); #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __LINE__, __FILE__ ) -/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC +/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC version of the Win32 simulator projects. It will be ignored in the GCC version. */ #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c index 0164a52c6..d7ac74fc8 100644 --- 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 demonstrate using queue sets from an ISR. */ vQueueSetAccessQueueSetFromISR(); + + /* Exercise event groups from interrupts. */ + vPeriodicEventGroupsProcessing(); } /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h index 1935f454b..ad1a5b7e7 100644 --- a/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WIN32-MingW/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. + FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -134,13 +134,13 @@ to exclude the API function. */ #define INCLUDE_pcTaskGetTaskName 1 #define INCLUDE_eTaskGetState 1 #define INCLUDE_xSemaphoreGetMutexHolder 1 -#define INCLUDE_xTimerPendCallbackFromISR 1 +#define INCLUDE_xTimerPendFunctionCallFromISR 1 /* Standard assert semantics. */ extern void vAssertCalled( unsigned long ulLine, const char * const pcFileName ); #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __LINE__, __FILE__ ) -/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC +/* configUSE_PORT_OPTIMISED_TASK_SELECTION is only available in the MSVC version of the Win32 simulator projects. It will be ignored in the GCC version. */ #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 -- 2.39.5