From 9666e46f169a19849eabcf600a2bdc19fa98bc05 Mon Sep 17 00:00:00 2001 From: Krzysztof Chruscinski Date: Tue, 18 Sep 2018 07:17:13 +0200 Subject: [PATCH] logging: fix undeclared __log_current_const_data_get Fix compilation failure when LOG_MODULE_DECLARE is used. Signed-off-by: Krzysztof Chruscinski --- include/logging/log.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/include/logging/log.h b/include/logging/log.h index b70f21c12d6..4dd8d76f8f1 100644 --- a/include/logging/log.h +++ b/include/logging/log.h @@ -315,8 +315,13 @@ int log_printk(const char *fmt, va_list ap); ()/*Empty*/ \ ) -#define __DYNAMIC_MODULE_DECLARE(_name) \ - extern struct log_source_dynamic_data LOG_ITEM_DYNAMIC_DATA(_name) +#define __DYNAMIC_MODULE_DECLARE(_name) \ + extern struct log_source_dynamic_data LOG_ITEM_DYNAMIC_DATA(_name);\ + static inline struct log_source_dynamic_data * \ + __log_current_dynamic_data_get(void) \ + { \ + return &LOG_ITEM_DYNAMIC_DATA(_name); \ + } #define _LOG_RUNTIME_MODULE_DECLARE(_name) \ _LOG_EVAL( \ @@ -325,9 +330,14 @@ int log_printk(const char *fmt, va_list ap); () \ ) -#define _LOG_MODULE_DECLARE(_name, _level) \ +#define _LOG_MODULE_DECLARE(_name, _level) \ extern const struct log_source_const_data LOG_ITEM_CONST_DATA(_name) \ - _LOG_RUNTIME_MODULE_DECLARE(_name) + _LOG_RUNTIME_MODULE_DECLARE(_name); \ + static inline const struct log_source_const_data * \ + __log_current_const_data_get(void) \ + { \ + return &LOG_ITEM_CONST_DATA(_name); \ + } /** * @brief Macro for declaring a log module (not registering it).