From: Liam Girdwood Date: Tue, 18 Feb 2014 11:43:16 +0000 (+0000) Subject: ASoC: Intel: Rename SST trace event header to be less generic. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b47bd099fbb3412e34e8915c7a06bc3dbe73bc01;p=deliverable%2Flinux.git ASoC: Intel: Rename SST trace event header to be less generic. The Intel audio DSP SST trace event header has been renamed from sst.h to intel-sst.h in order to avoid any confusion with any future Samoa Standard Time drivers ;) Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/include/trace/events/intel-sst.h b/include/trace/events/intel-sst.h new file mode 100644 index 000000000000..76c72d3f1902 --- /dev/null +++ b/include/trace/events/intel-sst.h @@ -0,0 +1,148 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM intel-sst + +#if !defined(_TRACE_INTEL_SST_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_INTEL_SST_H + +#include +#include +#include + +DECLARE_EVENT_CLASS(sst_ipc_msg, + + TP_PROTO(unsigned int val), + + TP_ARGS(val), + + TP_STRUCT__entry( + __field( unsigned int, val ) + ), + + TP_fast_assign( + __entry->val = val; + ), + + TP_printk("0x%8.8x", (unsigned int)__entry->val) +); + +DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_tx, + + TP_PROTO(unsigned int val), + + TP_ARGS(val) + +); + +DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_rx, + + TP_PROTO(unsigned int val), + + TP_ARGS(val) + +); + +DECLARE_EVENT_CLASS(sst_ipc_mailbox, + + TP_PROTO(unsigned int offset, unsigned int val), + + TP_ARGS(offset, val), + + TP_STRUCT__entry( + __field( unsigned int, offset ) + __field( unsigned int, val ) + ), + + TP_fast_assign( + __entry->offset = offset; + __entry->val = val; + ), + + TP_printk(" 0x%4.4x = 0x%8.8x", + (unsigned int)__entry->offset, (unsigned int)__entry->val) +); + +DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_rdata, + + TP_PROTO(unsigned int offset, unsigned int val), + + TP_ARGS(offset, val) + +); + +DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_wdata, + + TP_PROTO(unsigned int offset, unsigned int val), + + TP_ARGS(offset, val) + +); + +DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_rdata, + + TP_PROTO(unsigned int offset, unsigned int val), + + TP_ARGS(offset, val) + +); + +DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_wdata, + + TP_PROTO(unsigned int offset, unsigned int val), + + TP_ARGS(offset, val) + +); + +DECLARE_EVENT_CLASS(sst_ipc_mailbox_info, + + TP_PROTO(unsigned int size), + + TP_ARGS(size), + + TP_STRUCT__entry( + __field( unsigned int, size ) + ), + + TP_fast_assign( + __entry->size = size; + ), + + TP_printk("Mailbox bytes 0x%8.8x", (unsigned int)__entry->size) +); + +DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_read, + + TP_PROTO(unsigned int size), + + TP_ARGS(size) + +); + +DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_write, + + TP_PROTO(unsigned int size), + + TP_ARGS(size) + +); + +DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_read, + + TP_PROTO(unsigned int size), + + TP_ARGS(size) + +); + +DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_write, + + TP_PROTO(unsigned int size), + + TP_ARGS(size) + +); + +#endif /* _TRACE_SST_H */ + +/* This part must be outside protection */ +#include diff --git a/include/trace/events/sst.h b/include/trace/events/sst.h deleted file mode 100644 index 1a0d6b3b1ae1..000000000000 --- a/include/trace/events/sst.h +++ /dev/null @@ -1,148 +0,0 @@ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM sst - -#if !defined(_TRACE_SST_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_SST_H - -#include -#include -#include - -DECLARE_EVENT_CLASS(sst_ipc_msg, - - TP_PROTO(unsigned int val), - - TP_ARGS(val), - - TP_STRUCT__entry( - __field( unsigned int, val ) - ), - - TP_fast_assign( - __entry->val = val; - ), - - TP_printk("0x%8.8x", (unsigned int)__entry->val) -); - -DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_tx, - - TP_PROTO(unsigned int val), - - TP_ARGS(val) - -); - -DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_rx, - - TP_PROTO(unsigned int val), - - TP_ARGS(val) - -); - -DECLARE_EVENT_CLASS(sst_ipc_mailbox, - - TP_PROTO(unsigned int offset, unsigned int val), - - TP_ARGS(offset, val), - - TP_STRUCT__entry( - __field( unsigned int, offset ) - __field( unsigned int, val ) - ), - - TP_fast_assign( - __entry->offset = offset; - __entry->val = val; - ), - - TP_printk(" 0x%4.4x = 0x%8.8x", - (unsigned int)__entry->offset, (unsigned int)__entry->val) -); - -DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_rdata, - - TP_PROTO(unsigned int offset, unsigned int val), - - TP_ARGS(offset, val) - -); - -DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_wdata, - - TP_PROTO(unsigned int offset, unsigned int val), - - TP_ARGS(offset, val) - -); - -DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_rdata, - - TP_PROTO(unsigned int offset, unsigned int val), - - TP_ARGS(offset, val) - -); - -DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_wdata, - - TP_PROTO(unsigned int offset, unsigned int val), - - TP_ARGS(offset, val) - -); - -DECLARE_EVENT_CLASS(sst_ipc_mailbox_info, - - TP_PROTO(unsigned int size), - - TP_ARGS(size), - - TP_STRUCT__entry( - __field( unsigned int, size ) - ), - - TP_fast_assign( - __entry->size = size; - ), - - TP_printk("Mailbox bytes 0x%8.8x", (unsigned int)__entry->size) -); - -DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_read, - - TP_PROTO(unsigned int size), - - TP_ARGS(size) - -); - -DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_write, - - TP_PROTO(unsigned int size), - - TP_ARGS(size) - -); - -DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_read, - - TP_PROTO(unsigned int size), - - TP_ARGS(size) - -); - -DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_write, - - TP_PROTO(unsigned int size), - - TP_ARGS(size) - -); - -#endif /* _TRACE_SST_H */ - -/* This part must be outside protection */ -#include diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c index 1888de54d079..e0ad2e50be52 100644 --- a/sound/soc/intel/sst-dsp.c +++ b/sound/soc/intel/sst-dsp.c @@ -24,7 +24,7 @@ #include "sst-dsp-priv.h" #define CREATE_TRACE_POINTS -#include +#include /* Public API */ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value)