X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.h;h=53502d4d6d9f8e2be33990591625186fc657ba92;hp=92613161aa7203d8a41ebc5a8ddafc7a7247234f;hb=1163435e19f316a4a97fd33f1467f5c1684db654;hpb=56504fdd7353732525e34f1e3fbd44346588f979

diff --git a/src/target/trace.h b/src/target/trace.h
index 92613161aa..53502d4d6d 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -20,28 +20,33 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct target_s;
-struct command_context_s;
+struct target;
+struct command_context;
 
-typedef struct trace_point_s
+struct trace_point
 {
-	u32 address;
-	u64 hit_counter;
-} trace_point_t;
+	uint32_t address;
+	uint64_t hit_counter;
+};
 
-typedef struct trace_s
+struct trace
 {
-	u32 num_trace_points;
-	u32 trace_points_size;
-	trace_point_t *trace_points;
-	u32 trace_history_size;
-	u32 *trace_history;
-	u32 trace_history_pos;
+	uint32_t num_trace_points;
+	uint32_t trace_points_size;
+	struct trace_point *trace_points;
+	uint32_t trace_history_size;
+	uint32_t *trace_history;
+	uint32_t trace_history_pos;
 	int trace_history_overflowed;
-} trace_t;
+};
 
+/**
+ * \todo This enum is one of the few things in this file related
+ * to *hardware* tracing ... split such "real" tracing out from
+ * the contrib/libdcc support.
+ */
 typedef enum trace_status
 {
 	TRACE_IDLE = 0x0,
@@ -51,10 +56,10 @@ typedef enum trace_status
 	TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-extern int trace_point(struct target_s *target, u32 number);
-extern int trace_register_commands(struct command_context_s *cmd_ctx);
+int trace_point(struct target *target, uint32_t number);
+int trace_register_commands(struct command_context *cmd_ctx);
 
-#define ERROR_TRACE_IMAGE_UNAVAILABLE		-(1500)
-#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE	-(1501)
+#define ERROR_TRACE_IMAGE_UNAVAILABLE		(-1500)
+#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE	(-1501)
 
 #endif /* TRACE_H */