michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: Fix LOG_LEVEL dependency on log.h include

Browse source 
Refactoring of LOG_MODULE_REGISTER (commit 88648699) introduced
regression: fixed ordering of LOG_LEVEL definition and log.h
include.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2018-11-15 07:46:15 +01:00 • committed by Anas Nashif
commit 6a960e7d17
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/logging/log.h
View file

@ -270,14 +270,16 @@ int log_printk(const char *fmt, va_list ap);
char *log_strdup(const char *str);
/* Macro expects that optionally on second argument local log level is provided.
* If provided it is returned, otherwise default log level is returned.
* If provided it is returned, otherwise default log level is returned or
* LOG_LEVEL, if it was locally defined.
*/
#if defined(LOG_LEVEL) && defined(CONFIG_LOG)
#define _LOG_LEVEL_RESOLVE(...) \
__LOG_ARG_2(__VA_ARGS__, LOG_LEVEL)
#if !defined(CONFIG_LOG)
#define _LOG_LEVEL_RESOLVE(...) LOG_LEVEL_NONE
#else
#define _LOG_LEVEL_RESOLVE(...) \
__LOG_ARG_2(__VA_ARGS__, CONFIG_LOG_DEFAULT_LEVEL)
_LOG_EVAL(LOG_LEVEL, \
(__LOG_ARG_2(__VA_ARGS__, LOG_LEVEL)), \
(__LOG_ARG_2(__VA_ARGS__, CONFIG_LOG_DEFAULT_LEVEL)))
#endif
/* Return first argument */