Skip to content

Commit bb64419

Browse files
nordic-krchnashif
authored andcommitted
logging: Adapt ADSP backend to v2
Added support for v2 backend interface to ADSP. Signed-off-by: Krzysztof Chruscinski <[email protected]>
1 parent da31e09 commit bb64419

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

subsys/logging/Kconfig.backends

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ endif # LOG_BACKEND_NET
260260
config LOG_BACKEND_ADSP
261261
bool "Enable Intel ADSP buffer backend"
262262
depends on SOC_FAMILY_INTEL_ADSP
263-
depends on !LOG2
264263
help
265264
Enable backend for the host trace protocol of the Intel ADSP
266265
family of audio processors

subsys/logging/log_backend_adsp.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@ static inline void put_sync_hexdump(const struct log_backend *const backend,
7070
metadata, data, length, format_flags());
7171
}
7272

73+
static void process(const struct log_backend *const backend,
74+
union log_msg2_generic *msg)
75+
{
76+
log_output_msg2_process(&log_output_adsp, &msg->log, format_flags());
77+
}
78+
7379
const struct log_backend_api log_backend_adsp_api = {
74-
#ifdef CONFIG_LOG_IMMEDIATE
75-
.put_sync_string = put_sync_string,
76-
.put_sync_hexdump = put_sync_hexdump,
77-
#else
78-
.put = put,
79-
.dropped = dropped,
80-
#endif
80+
.process = IS_ENABLED(CONFIG_LOG2) ? process : NULL,
81+
.put_sync_string = IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ?
82+
put_sync_string : NULL,
83+
.put_sync_hexdump = IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ?
84+
put_sync_hexdump : NULL,
85+
.put = IS_ENABLED(CONFIG_LOG_MODE_DEFERRED) ? put : NULL,
86+
.dropped = IS_ENABLED(CONFIG_LOG_IMMEDIATE) ? NULL : dropped,
8187
.panic = panic,
8288
};
8389

0 commit comments

Comments
 (0)