X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftrace.h;h=c554c731000459a6282a6e9db88c71ed8eb7677d;hb=30f6142fc8570549ff42676ffe16425c6a6ef264;hp=f7d9e5b1a7667d040ae93289eec36813f0bf7a27;hpb=e27696f6b04459e935a0a5f65f7f668cb02970dd;p=openocd.git

diff --git a/src/target/trace.h b/src/target/trace.h
index f7d9e5b1a7..c554c73100 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -20,27 +20,33 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "target.h"
-#include "command.h"
 #include "types.h"
 
-typedef struct trace_point_s
+struct target;
+struct command_context;
+
+struct trace_point
 {
-	u32 address;
-	u64 hit_counter;
-} trace_point_t;
+	uint32_t address;
+	uint64_t hit_counter;
+};
 
-typedef struct trace_s
+struct trace
 {
-	int num_trace_points;
-	int trace_points_size;
-	trace_point_t *trace_points;
-	int trace_history_size;
-	u32 *trace_history;
-	int 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,
@@ -50,8 +56,8 @@ typedef enum trace_status
 	TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-extern int trace_point(struct target_s *target, int 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)