X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fasoc.h;h=7d86af876058a34908f77878698f5d610ab46d3c;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=2e78bc3f6ec6160a052bd2b30deae624f4dbe4ac;hpb=83be3f4fe4bf72352850670841e6fb46f44d88f3;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
index 2e78bc3f..7d86af87 100644
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -1,10 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM asoc
 
 #if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_ASOC_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 #include <linux/ktime.h>
 #include <linux/version.h>
 
@@ -13,7 +14,9 @@
 #ifndef _TRACE_ASOC_DEF
 #define _TRACE_ASOC_DEF
 struct snd_soc_jack;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
 struct snd_soc_codec;
+#endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
 	LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 struct snd_soc_platform;
@@ -326,6 +329,36 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_irq,
 	)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report,
+
+	asoc_snd_soc_jack_report,
+
+	TP_PROTO(struct snd_soc_jack *jack, int mask, int val),
+
+	TP_ARGS(jack, mask, val),
+
+	TP_FIELDS(
+		ctf_string(name, jack->jack->id)
+		ctf_integer(int, mask, mask)
+		ctf_integer(int, val, val)
+	)
+)
+
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify,
+
+	asoc_snd_soc_jack_notify,
+
+	TP_PROTO(struct snd_soc_jack *jack, int val),
+
+	TP_ARGS(jack, val),
+
+	TP_FIELDS(
+		ctf_string(name, jack->jack->id)
+		ctf_integer(int, val, val)
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report,
 
 	asoc_snd_soc_jack_report,
@@ -354,7 +387,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify,
 		ctf_integer(int, val, val)
 	)
 )
+#endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
 LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
 
 	asoc_snd_soc_cache_sync,
@@ -371,8 +406,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
 		ctf_integer(int, id, codec->CODEC_ID_FIELD)
 	)
 )
+#endif
 
 #endif /* LTTNG_TRACE_ASOC_H */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>