Skip to content

Commit 320f7c3

Browse files
nordic-krchnashif
authored andcommitted
net: lib: openthread: logging: Refactor logging function
Refactor logging function to avoid multiple macro calls. Signed-off-by: Krzysztof Chruscinski <[email protected]>
1 parent be80109 commit 320f7c3

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

subsys/net/lib/openthread/platform/logging.c

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
1818

1919
#include "platform-zephyr.h"
2020

21+
/* Convert OT log level to zephyr log level. */
22+
static inline int log_translate(otLogLevel aLogLevel)
23+
{
24+
switch (aLogLevel) {
25+
case OT_LOG_LEVEL_CRIT:
26+
return LOG_LEVEL_ERR;
27+
case OT_LOG_LEVEL_WARN:
28+
return LOG_LEVEL_WRN;
29+
case OT_LOG_LEVEL_NOTE:
30+
case OT_LOG_LEVEL_INFO:
31+
return LOG_LEVEL_INF;
32+
case OT_LOG_LEVEL_DEBG:
33+
return LOG_LEVEL_DBG;
34+
default:
35+
break;
36+
}
37+
38+
return -1;
39+
}
2140

2241
void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion,
2342
const char *aFormat, ...)
@@ -47,6 +66,11 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion,
4766
#endif
4867

4968
va_list param_list;
69+
int level = log_translate(aLogLevel);
70+
71+
if (level < 0) {
72+
return;
73+
}
5074

5175
va_start(param_list, aFormat);
5276

@@ -55,26 +79,6 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion,
5579
* been duplicated. So, to save time, in Z_LOG_VA macro calls
5680
* we will use LOG_STRDUP_EXEC option.
5781
*/
58-
switch (aLogLevel) {
59-
case OT_LOG_LEVEL_CRIT:
60-
Z_LOG_VA(LOG_LEVEL_ERR, aFormat, param_list, args_num,
61-
LOG_STRDUP_EXEC);
62-
break;
63-
case OT_LOG_LEVEL_WARN:
64-
Z_LOG_VA(LOG_LEVEL_WRN, aFormat, param_list, args_num,
65-
LOG_STRDUP_EXEC);
66-
break;
67-
case OT_LOG_LEVEL_NOTE:
68-
case OT_LOG_LEVEL_INFO:
69-
Z_LOG_VA(LOG_LEVEL_INF, aFormat, param_list, args_num,
70-
LOG_STRDUP_EXEC);
71-
break;
72-
case OT_LOG_LEVEL_DEBG:
73-
Z_LOG_VA(LOG_LEVEL_DBG, aFormat, param_list, args_num,
74-
LOG_STRDUP_EXEC);
75-
break;
76-
default:
77-
break;
78-
}
82+
Z_LOG_VA(level, aFormat, param_list, args_num, LOG_STRDUP_EXEC);
7983
va_end(param_list);
8084
}

0 commit comments

Comments
 (0)