From 8db85d71b2cf112465396f0605d2d60794461b17 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Tue, 27 Sep 2016 11:50:46 +0800 Subject: [PATCH] Fix UNTESTED_FUNCTION includes, remove unnecessary mux initialization in event groups --- components/freertos/event_groups.c | 7 ------- .../freertos/include/freertos/FreeRTOSConfig.h | 16 ++++++++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/components/freertos/event_groups.c b/components/freertos/event_groups.c index 0eafab10a..902a4ad72 100644 --- a/components/freertos/event_groups.c +++ b/components/freertos/event_groups.c @@ -124,7 +124,6 @@ typedef struct xEventGroupDefinition /* Again: one mux for all events. Maybe this can be made more granular. ToDo: look into that. -JD */ static portMUX_TYPE xEventGroupMux = portMUX_INITIALIZER_UNLOCKED; -static BaseType_t xMuxInitialized = pdFALSE; /*-----------------------------------------------------------*/ @@ -145,12 +144,6 @@ EventGroupHandle_t xEventGroupCreate( void ) { EventGroup_t *pxEventBits; - //Initialize mux, if needed - if ( xMuxInitialized == pdFALSE ) { - vPortCPUInitializeMutex( & xEventGroupMux ); - xMuxInitialized = pdTRUE; - } - pxEventBits = pvPortMalloc( sizeof( EventGroup_t ) ); if( pxEventBits != NULL ) { diff --git a/components/freertos/include/freertos/FreeRTOSConfig.h b/components/freertos/include/freertos/FreeRTOSConfig.h index 466c6404c..d1958e770 100644 --- a/components/freertos/include/freertos/FreeRTOSConfig.h +++ b/components/freertos/include/freertos/FreeRTOSConfig.h @@ -124,6 +124,16 @@ abort(); \ } #endif + +#if CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION +#include +#include "rom/ets_sys.h" +#define UNTESTED_FUNCTION() { ets_printf("Untested FreeRTOS function %s\r\n", __FUNCTION__); configASSERT(false); } while(0) +#else +#define UNTESTED_FUNCTION() +#endif + + #endif /* def __ASSEMBLER__ */ @@ -263,12 +273,6 @@ #define configXT_SIMULATOR 0 -#if CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION -#include "rom/ets_sys.h" -#define UNTESTED_FUNCTION() { ets_printf("Untested FreeRTOS function %s\r\n", __FUNCTION__); configASSERT(false); } while(0) -#else -#define UNTESTED_FUNCTION() -#endif #endif /* FREERTOS_CONFIG_H */