Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix UNTESTED_FUNCTION includes, remove unnecessary mux initialization in event groups

Browse source
This commit is contained in:
Jeroen Domburg 2016-09-27 11:50:46 +08:00
parent fc53bb6ed5
commit 8db85d71b2
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/freertos/event_groups.c
View file

@ -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 )
{

16
components/freertos/include/freertos/FreeRTOSConfig.h
View file

@ -124,6 +124,16 @@
abort(); \
}
#endif
#if CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION
#include <stdlib.h>
#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 */