OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

logging: frontends: stmesp: alternate message output option 

Add an alternate message output option in which messages are
ended with an additional zero data byte with marker and timestamp.
Can be used to maintain compatibility with certain decoders.

Signed-off-by: Juha Sunnari <juha.sunnari@nordicsemi.no>
This commit is contained in:
Juha Sunnari 2024-11-11 10:50:46 +02:00 committed by Anas Nashif
parent 84dc9a1721
commit 51bc60e142
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
subsys/logging/frontends/Kconfig
View File

@ -74,6 +74,14 @@ config LOG_FRONTEND_STMESP_GUARANTEED_ACCESS
When enabled, accessing STMESP registers will stall if write cannot be
performed (e.g. ETR buffer is full).
config LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP
bool "Generate timestamp and marker at message end"
help
Generate a zero data byte with timestamp and marker at message end,
instead of generating a timestamp and marker at message start and
a flag at end. This can be used to maintain compatibility with
certain decoders.
endif # LOG_FRONTEND_STMESP
config LOG_FRONTEND_STMESP_DEMUX

32
subsys/logging/frontends/log_frontend_stmesp.c
View File

@ -312,7 +312,11 @@ static inline int16_t get_source_id(const void *source)
static void packet_end(STMESP_Type *stm_esp)
{
STM_FLAG(stm_esp);
if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
STM_D8(stm_esp, 0, true, true);
} else {
STM_FLAG(stm_esp);
}
atomic_set(&new_data, 1);
}
@ -363,7 +367,11 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
return;
}
STM_D32(stm_esp, hdr.raw, use_timestamp, true);
if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
STM_D32(stm_esp, hdr.raw, false, false);
} else {
STM_D32(stm_esp, hdr.raw, use_timestamp, true);
}
(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
flags, strl, ARRAY_SIZE(strl));
write_data(sname, sname_len, stm_esp);
@ -412,7 +420,11 @@ void log_frontend_msg(const void *source, const struct log_msg_desc desc, uint8_
return;
}
STM_D32(stm_esp, dict_desc.raw, true, true);
if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
STM_D32(stm_esp, dict_desc.raw, false, false);
} else {
STM_D32(stm_esp, dict_desc.raw, true, true);
}
(void)cbprintf_package_convert(package, desc.package_len, package_cb, stm_esp,
flags, NULL, 0);
if (data) {
@ -460,7 +472,11 @@ static inline void msg_start(STMESP_Type *stm_esp, uint32_t level, const void *s
{
union stm_log_dict_hdr dict_desc = DICT_HDR_INITIALIZER(level, get_source_id(source), 0);
STM_D32(stm_esp, dict_desc.raw, true, true);
if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
STM_D32(stm_esp, dict_desc.raw, false, false);
} else {
STM_D32(stm_esp, dict_desc.raw, true, true);
}
STM_D32(stm_esp, package_hdr, false, false);
STM_D32(stm_esp, (uint32_t)fmt, false, false);
}
@ -609,8 +625,12 @@ int log_frontend_stmesp_etr_ready(void)
early_buf_read_mode();
while ((len = early_buf_get_data((void **)&buf)) > 0) {
/* Write first word with Marked and timestamp. */
STM_D32(stm_esp, *buf, true, true);
if (IS_ENABLED(CONFIG_LOG_FRONTEND_STMESP_MSG_END_TIMESTAMP)) {
STM_D32(stm_esp, *buf, false, false);
} else {
/* Write first word with Marked and timestamp. */
STM_D32(stm_esp, *buf, true, true);
}
buf++;
len -= sizeof(uint32_t);