michaelh/zephyr
1
0
Fork 0
Code Releases Activity

openthread: fix logging configuration

Browse source 
Currently, `CONFIG_OPENTHREAD_LOG_LEVEL` is used to set log level
in OT and register log modules in Zephyr. OpenThread allows 5
levels, causing issues when `OPENTHREAD_LOG_LEVEL_DEBG` is
selected ad we are trying to register modules with unknown lvl.

This commit adds `CONFIG_OPENTHREAD_MODULE_LOG_LEVEL` which is
aligned for Zephyr's log levels.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
This commit is contained in:
Maciej Baczmanski 2025-01-24 12:56:34 +01:00 • committed by Benjamin Cabé
commit 341359568f
5 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/openthread/platform/alarm.c
View file

@ -6,7 +6,7 @@
*/
#define LOG_MODULE_NAME net_openthread_alarm
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

2
modules/openthread/platform/ble.c
View file

@ -30,7 +30,7 @@
/* Zephyr Logging */
#define LOG_MODULE_NAME net_openthread_tcat
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

2
modules/openthread/platform/messagepool.c
View file

@ -10,7 +10,7 @@
#include <openthread/platform/messagepool.h>
#define LOG_MODULE_NAME net_otPlat_messagepool
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

2
modules/openthread/platform/uart.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
#define LOG_MODULE_NAME net_otPlat_uart
#include <zephyr/logging/log.h>

12
subsys/net/l2/openthread/Kconfig
View file

@ -89,6 +89,18 @@ config OPENTHREAD_LOG_LEVEL
default 4 if OPENTHREAD_LOG_LEVEL_INFO
default 5 if OPENTHREAD_LOG_LEVEL_DEBG
default 0
help
Log level for OpenThread stack.
config OPENTHREAD_PLATFORM_LOG_LEVEL
int
default 1 if OPENTHREAD_LOG_LEVEL_CRIT
default 2 if OPENTHREAD_LOG_LEVEL_WARN
default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
default 4 if OPENTHREAD_LOG_LEVEL_DEBG
default 0
help
Log level for OpenThread Zephyr platform.
menuconfig OPENTHREAD_L2_DEBUG
bool "OpenThread L2 log support"