X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fv4l2.h;h=dd7551e828428ce984b3ce63a155ca0af9213065;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=3766985354df948cae27466ef5eb9f4e6158f433;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/v4l2.h b/instrumentation/events/lttng-module/v4l2.h
index 37669853..dd7551e8 100644
--- a/instrumentation/events/lttng-module/v4l2.h
+++ b/instrumentation/events/lttng-module/v4l2.h
@@ -1,12 +1,38 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM v4l2
 
 #if !defined(LTTNG_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_V4L2_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class,
+
+	TP_PROTO(int minor, struct v4l2_buffer *buf),
+
+	TP_ARGS(minor, buf),
+
+	TP_FIELDS(
+		ctf_integer(int, minor, minor)
+		ctf_integer(u32, index, buf->index)
+		ctf_integer(u32, type, buf->type)
+		ctf_integer(u32, bytesused, buf->bytesused)
+		ctf_integer(u32, flags, buf->flags)
+		ctf_integer(u32, field, buf->field)
+		ctf_integer(s64, timestamp, v4l2_buffer_get_timestamp(buf))
+		ctf_integer(u32, timecode_type, buf->timecode.type)
+		ctf_integer(u32, timecode_flags, buf->timecode.flags)
+		ctf_integer(u8, timecode_frames, buf->timecode.frames)
+		ctf_integer(u8, timecode_seconds, buf->timecode.seconds)
+		ctf_integer(u8, timecode_minutes, buf->timecode.minutes)
+		ctf_integer(u8, timecode_hours, buf->timecode.hours)
+		ctf_array(u8, timecode_userbits, buf->timecode.userbits, 4)
+		ctf_integer(u32, sequence, buf->sequence)
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class,
 
 	TP_PROTO(int minor, struct v4l2_buffer *buf),
@@ -31,6 +57,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class,
 		ctf_integer(u32, sequence, buf->sequence)
 	)
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(v4l2_class,
 	v4l2_dqbuf,
@@ -52,4 +79,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(v4l2_class,
 #endif /* if !defined(LTTNG_TRACE_V4L2_H) || defined(TRACE_HEADER_MULTI_READ) */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>