michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: device: cdc_acm: Prevent recursive logging loop

Browse source 
Allow enabling CDC ACM logging only if CDC ACM is not used as logging
backend. This prevents endless recursive logging loop, especially
visible when minimal footprint logging is enabled.

Fixes: #52981

Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
This commit is contained in:
Tomasz Moń 2022-12-14 07:46:28 +01:00 • committed by Carles Cufí
commit 21975231e2
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/usb/device/class/cdc_acm.c
View file

@ -56,6 +56,14 @@
/* definitions */
#include <zephyr/logging/log.h>
#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart) \
&& defined(CONFIG_USB_CDC_ACM_LOG_LEVEL) \
&& CONFIG_USB_CDC_ACM_LOG_LEVEL != LOG_LEVEL_NONE
/* Prevent endless recursive logging loop and warn user about it */
#warning "USB_CDC_ACM_LOG_LEVEL forced to LOG_LEVEL_NONE"
#undef CONFIG_USB_CDC_ACM_LOG_LEVEL
#define CONFIG_USB_CDC_ACM_LOG_LEVEL LOG_LEVEL_NONE
#endif
LOG_MODULE_REGISTER(usb_cdc_acm, CONFIG_USB_CDC_ACM_LOG_LEVEL);
/* 115200bps, no parity, 1 stop bit, 8bit char */