Trace - make clear that trace context is unused with Zephyr

src/audio/aria/aria.c

@@ -327,6 +327,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(aria_interface, aria_uuid, aria_comp_tr);
 SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);

src/audio/asrc/asrc_ipc3.c

@@ -16,6 +16,7 @@
 
 SOF_DEFINE_REG_UUID(asrc);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
 LOG_MODULE_DECLARE(asrc, CONFIG_SOF_LOG_LEVEL);
 

src/audio/asrc/asrc_ipc4.c

@@ -16,6 +16,7 @@
 
 SOF_DEFINE_REG_UUID(asrc4);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
 
 int asrc_dai_configure_timestamp(struct comp_data *cd)

src/audio/base_fw.c

@@ -41,6 +41,7 @@
 LOG_MODULE_REGISTER(basefw, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(basefw);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(basefw_comp_tr, SOF_UUID(basefw_uuid), LOG_LEVEL_INFO);
 
 static struct ipc4_system_time_info global_system_time_info;
@@ -850,7 +851,9 @@ __cold static int basefw_set_large_config(struct comp_dev *dev, uint32_t param_i
 
 static const struct comp_driver comp_basefw = {
 	.uid	= SOF_RT_UUID(basefw_uuid),
+#ifndef __ZEPHYR__
 	.tctx	= &basefw_comp_tr,
+#endif
 	.ops	= {
 		.get_large_config = basefw_get_large_config,
 		.set_large_config = basefw_set_large_config,

src/audio/buffers/comp_buffer.c

@@ -29,6 +29,7 @@
 LOG_MODULE_REGISTER(buffer, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(buffer);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(buffer_tr, SOF_UUID(buffer_uuid), LOG_LEVEL_INFO);
 
 static size_t comp_buffer_get_data_available(struct sof_source *source)

src/audio/buffers/ring_buffer.c

@@ -18,6 +18,7 @@
 LOG_MODULE_REGISTER(ring_buffer, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(ring_buffer);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(ring_buffer_tr, SOF_UUID(ring_buffer_uuid), LOG_LEVEL_INFO);
 
 static inline struct ring_buffer *ring_buffer_from_sink(struct sof_sink *sink)

src/audio/chain_dma.c

@@ -43,6 +43,7 @@ static const uint32_t max_chain_number = DT_NUM_HDA_HOST_OUT + DT_NUM_HDA_HOST_I
 LOG_MODULE_REGISTER(chain_dma, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(chain_dma);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(chain_dma_tr, SOF_UUID(chain_dma_uuid), LOG_LEVEL_INFO);
 
 /* chain dma component private data */
@@ -787,7 +788,9 @@ __cold static void chain_task_free(struct comp_dev *dev)
 
 static const struct comp_driver comp_chain_dma = {
 	.uid = SOF_RT_UUID(chain_dma_uuid),
+#ifndef __ZEPHYR__
 	.tctx = &chain_dma_tr,
+#endif
 	.ops = {
 		.create = chain_task_create,
 		.trigger = chain_task_trigger,

src/audio/channel_map.c

@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(channel_map, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(chmap);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(chmap_tr, SOF_UUID(chmap_uuid), LOG_LEVEL_INFO);
 
 struct sof_ipc_channel_map *chmap_get(struct sof_ipc_stream_map *smap,

src/audio/codec/dts/dts.c

@@ -491,6 +491,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
 SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);

src/audio/component.c

@@ -48,6 +48,7 @@ struct comp_driver_list *comp_drivers_get(void)
 
 SOF_DEFINE_REG_UUID(component);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(comp_tr, SOF_UUID(component_uuid), LOG_LEVEL_INFO);
 
 int comp_register(struct comp_driver_info *drv)

src/audio/copier/copier.c

@@ -1298,6 +1298,7 @@ static APP_SYSUSER_DATA const struct module_interface copier_interface = {
 	.endpoint_ops = &copier_endpoint_ops,
 };
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
 
 DECLARE_MODULE_ADAPTER(copier_interface, copier_uuid, copier_comp_tr);

src/audio/crossover/crossover.c

@@ -689,6 +689,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(crossover_interface, crossover_uuid, crossover_tr);
 SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);

src/audio/dai-zephyr.c

@@ -2067,12 +2067,15 @@ int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_inf
 }
 #endif /* CONFIG_IPC_MAJOR_4 */
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_dai = {
 	.type	= SOF_COMP_DAI,
 	.uid	= SOF_RT_UUID(dai_uuid),
+#ifndef __ZEPHYR__
 	.tctx	= &dai_comp_tr,
+#endif
 	.ops	= {
 		.create				= dai_new,
 		.free				= dai_free,

src/audio/dcblock/dcblock.c

@@ -259,6 +259,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dcblock_interface, dcblock_uuid, dcblock_tr);
 SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);

src/audio/drc/drc_log.c

@@ -9,6 +9,7 @@
 
 SOF_DEFINE_REG_UUID(drc);
 LOG_MODULE_REGISTER(drc, CONFIG_SOF_LOG_LEVEL);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(drc_tr, SOF_UUID(drc_uuid), LOG_LEVEL_INFO);
 EXPORT_SYMBOL(log_const_drc);
 #ifdef CONFIG_LOG_RUNTIME_FILTERING

src/audio/eq_fir/eq_fir.c

@@ -533,6 +533,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_fir_interface, eq_fir_uuid, eq_fir_tr);
 SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);

src/audio/eq_iir/eq_iir.c

@@ -254,6 +254,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_iir_interface, eq_iir_uuid, eq_iir_tr);
 SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);

src/audio/google/google_ctc_audio_processing.c

@@ -472,6 +472,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(google_ctc_audio_processing_tr, SOF_UUID(google_ctc_audio_processing_uuid),
 	       LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_ctc_audio_processing_interface,

src/audio/google/google_hotword_detect.c

@@ -446,12 +446,15 @@ static int ghd_prepare(struct comp_dev *dev)
 	return comp_set_state(dev, COMP_TRIGGER_PREPARE);
 }
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver ghd_driver = {
 	.type	= SOF_COMP_KEYWORD_DETECT,
 	.uid	= SOF_RT_UUID(ghd_uuid),
+#ifndef __ZEPHYR__
 	.tctx	= &ghd_tr,
+#endif
 	.ops	= {
 		.create		= ghd_create,
 		.free		= ghd_free,

src/audio/google/google_rtc_audio_processing.c

@@ -860,6 +860,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
 			   LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_rtc_audio_processing_interface,

src/audio/host-zephyr.c

@@ -1311,12 +1311,15 @@ static uint64_t host_get_processed_data(struct comp_dev *dev, uint32_t stream_no
 	return ret;
 }
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_host = {
 	.type	= SOF_COMP_HOST,
 	.uid	= SOF_RT_UUID(host_uuid),
+#ifndef __ZEPHYR__
 	.tctx	= &host_tr,
+#endif
 	.ops	= {
 		.create				= host_new,
 		.free				= host_free,

src/audio/igo_nr/igo_nr.c

@@ -932,6 +932,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(igo_nr_interface, igo_nr_uuid, igo_nr_tr);
 SOF_MODULE_INIT(igo_nr, sys_comp_module_igo_nr_interface_init);

src/audio/kpb.c

@@ -2717,12 +2717,15 @@ static int kpb_set_large_config(struct comp_dev *dev, uint32_t param_id,
 	}
 }
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_kpb = {
 	.type = SOF_COMP_KPB,
 	.uid = SOF_RT_UUID(KPB_UUID),
+#ifndef __ZEPHYR__
 	.tctx = &kpb_tr,
+#endif
 	.ops = {
 		.create		= kpb_new,
 		.free		= kpb_free,

src/audio/level_multiplier/level_multiplier.c

@@ -200,6 +200,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(level_multiplier_tr, SOF_UUID(level_multiplier_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(level_multiplier_interface, level_multiplier_uuid, level_multiplier_tr);
 SOF_MODULE_INIT(level_multiplier, sys_comp_module_level_multiplier_interface_init);

src/audio/mfcc/mfcc.c

@@ -333,6 +333,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mfcc_interface, mfcc_uuid, mfcc_tr);
 SOF_MODULE_INIT(mfcc, sys_comp_module_mfcc_interface_init);

src/audio/mixer/mixer.c

@@ -256,6 +256,7 @@ static const struct module_interface mixer_interface = {
 	.free = mixer_free,
 };
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixer_interface, mixer_uuid, mixer_tr);
 SOF_MODULE_INIT(mixer, sys_comp_module_mixer_interface_init);

src/audio/mixin_mixout/mixin_mixout.c

@@ -1052,10 +1052,12 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixin_interface, mixin_uuid, mixin_tr);
 SOF_MODULE_INIT(mixin, sys_comp_module_mixin_interface_init);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixout_interface, mixout_uuid, mixout_tr);
 SOF_MODULE_INIT(mixout, sys_comp_module_mixout_interface_init);

src/audio/module_adapter/library/userspace_proxy.c

@@ -46,6 +46,7 @@ LOG_MODULE_REGISTER(userspace_proxy, CONFIG_SOF_LOG_LEVEL);
 /* 6f6b6f4b-6f73-7466-20e1e62b9779f003 */
 SOF_DEFINE_REG_UUID(userspace_proxy);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(userspace_proxy_tr, SOF_UUID(userspace_proxy_uuid), LOG_LEVEL_INFO);
 
 static const struct module_interface userspace_proxy_interface;

src/audio/module_adapter/module/cadence_ipc3.c

@@ -18,6 +18,7 @@
 
 SOF_DEFINE_REG_UUID(cadence_codec);
 LOG_MODULE_DECLARE(cadence_codec, CONFIG_SOF_LOG_LEVEL);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
 
 int cadence_codec_resolve_api(struct processing_module *mod)

src/audio/module_adapter/module/cadence_ipc4.c

@@ -16,6 +16,7 @@
 
 SOF_DEFINE_REG_UUID(cadence_codec);
 LOG_MODULE_DECLARE(cadence_codec, CONFIG_SOF_LOG_LEVEL);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
 
 int cadence_codec_resolve_api(struct processing_module *mod)

src/audio/module_adapter/module/dolby/dax.c

@@ -966,6 +966,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(dolby_dax_audio_processing_tr, SOF_UUID(dolby_dax_audio_processing_uuid),
 	       LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dolby_dax_audio_processing_interface, dolby_dax_audio_processing_uuid,

src/audio/module_adapter/module/passthrough.c

@@ -150,6 +150,7 @@ static const struct module_interface passthrough_interface = {
 	.free = passthrough_codec_free
 };
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(passthrough_tr, SOF_UUID(passthrough_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(passthrough_interface, passthrough_uuid, passthrough_tr);
 SOF_MODULE_INIT(passthrough, sys_comp_module_passthrough_interface_init);

src/audio/module_adapter/module/waves/waves.c

@@ -962,6 +962,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(waves_tr, SOF_UUID(waves_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(waves_interface, waves_uuid, waves_tr);
 SOF_MODULE_INIT(waves, sys_comp_module_waves_interface_init);

src/audio/multiband_drc/multiband_drc.c

@@ -460,6 +460,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(multiband_drc_tr, SOF_UUID(multiband_drc_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(multiband_drc_interface, multiband_drc_uuid, multiband_drc_tr);
 SOF_MODULE_INIT(multiband_drc, sys_comp_module_multiband_drc_interface_init);

src/audio/mux/mux_ipc3.c

@@ -25,10 +25,12 @@ LOG_MODULE_DECLARE(muxdemux, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mux);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mux_tr, SOF_UUID(mux_uuid), LOG_LEVEL_INFO);
 
 SOF_DEFINE_REG_UUID(demux);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(demux_tr, SOF_UUID(demux_uuid), LOG_LEVEL_INFO);
 
 static int mux_set_values(struct processing_module *mod)

src/audio/mux/mux_ipc4.c

@@ -26,10 +26,12 @@ LOG_MODULE_DECLARE(muxdemux, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mux4);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(mux_tr, SOF_UUID(mux4_uuid), LOG_LEVEL_INFO);
 
 SOF_DEFINE_REG_UUID(demux);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(demux_tr, SOF_UUID(demux_uuid), LOG_LEVEL_INFO);
 
 static int build_config(struct processing_module *mod, struct mux_data *cfg)

src/audio/nxp/eap.c

@@ -31,6 +31,7 @@
 
 LOG_MODULE_REGISTER(nxp_eap, CONFIG_SOF_LOG_LEVEL);
 SOF_DEFINE_REG_UUID(nxp_eap);
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(nxp_eap_tr, SOF_UUID(nxp_eap_uuid), LOG_LEVEL_INFO);
 
 #define NXP_EAP_DEFAULT_MAX_BLOCK_SIZE 480

src/audio/phase_vocoder/phase_vocoder.c

@@ -21,6 +21,7 @@ LOG_MODULE_REGISTER(phase_vocoder, CONFIG_SOF_LOG_LEVEL);
 /* Creates the component trace. Traces show in trace console the component
  * info, warning, and error messages.
  */
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(phase_vocoder_tr, SOF_UUID(phase_vocoder_uuid), LOG_LEVEL_INFO);
 
 #if STFT_DEBUG

src/audio/pipeline/pipeline-graph.c

@@ -35,6 +35,7 @@ LOG_MODULE_REGISTER(pipe, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(pipe);
 
+/* unused with Zephyr, generates no output */
 DECLARE_TR_CTX(pipe_tr, SOF_UUID(pipe_uuid), LOG_LEVEL_INFO);
 
 /* number of pipeline stream metadata objects we export in mailbox */
@@ -140,12 +141,15 @@ struct pipeline *pipeline_new(struct k_heap *heap, uint32_t pipeline_id, uint32_
 	p->pipeline_id = pipeline_id;
 	p->status = COMP_STATE_INIT;
 	p->trigger.cmd = COMP_TRIGGER_NO_ACTION;
+#ifndef __ZEPHYR__
+	/* Zephyr's tr_*() macros ignore the trace context, no need to copy it */
 	ret = memcpy_s(&p->tctx, sizeof(struct tr_ctx), &pipe_tr,
 		       sizeof(struct tr_ctx));
 	if (ret < 0) {
 		pipe_err(p, "failed to copy trace settings");
 		goto free;
 	}
+#endif
 
 	ret = pipeline_posn_offset_get(&p->posn_offset);
 	if (ret < 0) {