X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fgpio.h;h=6e328d4a36dc760a33aa524e034a0627fd905e17;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hp=e6002c497687037fd178d178473c5a448244208a;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/gpio.h b/instrumentation/events/lttng-module/gpio.h
index e6002c49..6e328d4a 100644
--- a/instrumentation/events/lttng-module/gpio.h
+++ b/instrumentation/events/lttng-module/gpio.h
@@ -1,56 +1,38 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM gpio
 
-#if !defined(_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_GPIO_H
+#if !defined(LTTNG_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_GPIO_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
 
-TRACE_EVENT(gpio_direction,
+LTTNG_TRACEPOINT_EVENT(gpio_direction,
 
 	TP_PROTO(unsigned gpio, int in, int err),
 
 	TP_ARGS(gpio, in, err),
 
-	TP_STRUCT__entry(
-		__field(unsigned, gpio)
-		__field(int, in)
-		__field(int, err)
-	),
-
-	TP_fast_assign(
-		tp_assign(gpio, gpio);
-		tp_assign(in, in);
-		tp_assign(err, err);
-	),
-
-	TP_printk("%u %3s (%d)", __entry->gpio,
-		__entry->in ? "in" : "out", __entry->err)
+	TP_FIELDS(
+		ctf_integer(unsigned, gpio, gpio)
+		ctf_integer(int, in, in)
+		ctf_integer(int, err, err)
+	)
 )
 
-TRACE_EVENT(gpio_value,
+LTTNG_TRACEPOINT_EVENT(gpio_value,
 
 	TP_PROTO(unsigned gpio, int get, int value),
 
 	TP_ARGS(gpio, get, value),
 
-	TP_STRUCT__entry(
-		__field(unsigned, gpio)
-		__field(int, get)
-		__field(int, value)
-	),
-
-	TP_fast_assign(
-		tp_assign(gpio, gpio);
-		tp_assign(get, get);
-		tp_assign(value, value);
-	),
-
-	TP_printk("%u %3s %d", __entry->gpio,
-		__entry->get ? "get" : "set", __entry->value)
+	TP_FIELDS(
+		ctf_integer(unsigned, gpio, gpio)
+		ctf_integer(int, get, get)
+		ctf_integer(int, value, value)
+	)
 )
 
-#endif /* if !defined(_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ) */
+#endif /* if !defined(LTTNG_TRACE_GPIO_H) || defined(TRACE_HEADER_MULTI_READ) */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"