From f34110009ac552b4632a276c1cb1754f4013b282 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Mon, 22 Aug 2016 17:45:46 +0800 Subject: [PATCH] Add C99-style named field in initialisation struct --- components/freertos/include/freertos/portmacro.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/components/freertos/include/freertos/portmacro.h b/components/freertos/include/freertos/portmacro.h index c698cb8cb..bb574a1aa 100644 --- a/components/freertos/include/freertos/portmacro.h +++ b/components/freertos/include/freertos/portmacro.h @@ -147,11 +147,17 @@ typedef struct { #define portMUX_VAL_MASK 0x000000FF #define portMUX_VAL_SHIFT 0 -//Keep this in sync with the portMUX_TYPE struct definition +//Keep this in sync with the portMUX_TYPE struct definition please. #ifdef portMUX_DEBUG -#define portMUX_INITIALIZER_UNLOCKED { portMUX_MAGIC_VAL|portMUX_FREE_VAL } +#define portMUX_INITIALIZER_UNLOCKED { \ + .mux = portMUX_MAGIC_VAL|portMUX_FREE_VAL \ + } #else -#define portMUX_INITIALIZER_UNLOCKED { portMUX_MAGIC_VAL|portMUX_FREE_VAL, "(never locked)", -1 } +#define portMUX_INITIALIZER_UNLOCKED { \ + .mux = portMUX_MAGIC_VAL|portMUX_FREE_VAL, \ + .lastLockedFn = "(never locked)", \ + .lastLockedLine = -1 \ + } #endif /* Critical section management. NW-TODO: replace XTOS_SET_INTLEVEL with more efficient version, if any? */