Skip to content

Commit 28f9e04

Browse files
committed
uuid: move the uuid header from buffer.h to trace.h
uuid.h isn't needed in buffer.h. However just removing it from there breaks compilation because of multiple trace context definitions like DECLARE_TR_CTX(comp_tr, SOF_UUID(component_uuid), LOG_LEVEL_INFO); in files, not explicitly including uuid.h. To make a simple fix move the header to trace.h because that is anyway needed for all such lines. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent ea9edfb commit 28f9e04

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/include/sof/audio/buffer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <rtos/panic.h>
1717
#include <rtos/alloc.h>
1818
#include <rtos/cache.h>
19-
#include <sof/lib/uuid.h>
2019
#include <sof/list.h>
2120
#include <sof/coherent.h>
2221
#include <sof/math/numbers.h>

src/include/sof/trace/trace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#endif
3232
#include <sof/common.h>
3333

34+
#if (defined(__ZEPHYR__) && defined(CONFIG_ZEPHYR_LOG)) || CONFIG_LIBRARY
35+
#include <sof/lib/uuid.h>
36+
#endif
3437
#include <sof/trace/preproc.h>
3538
#include <sof/trace/trace-boot.h>
3639

@@ -128,6 +131,7 @@ static inline void mtrace_printf(int log_level, const char *format_str, ...)
128131
/**
129132
* Trace context.
130133
*/
134+
struct sof_uuid_entry;
131135
struct tr_ctx {
132136
const struct sof_uuid_entry *uuid_p; /**< UUID pointer, use SOF_UUID() to init */
133137
uint32_t level; /**< Default log level */

0 commit comments

Comments
 (0)