X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftrace.h;h=f6615f599f0018055048bf99dc04fd0e623d9661;hb=3885ab5a5af7ece410ce3eeb1059da3ea950436a;hp=f0e92f94b0deafb0672077e5a910e1bc30f912fc;hpb=40580e2d71ac56131a5da7e5f67a0b63450e4f24;p=openocd.git

diff --git a/src/target/trace.h b/src/target/trace.h
index f0e92f94b0..f6615f599f 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -20,24 +20,25 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include "target.h"
-#include "command.h"
 #include "types.h"
 
+struct target_s;
+struct command_context_s;
+
 typedef struct trace_point_s
 {
-	u32 address;
-	u64 hit_counter;
+	uint32_t address;
+	uint64_t hit_counter;
 } trace_point_t;
 
 typedef struct trace_s
 {
-	u32 num_trace_points;
-	u32 trace_points_size;
+	uint32_t num_trace_points;
+	uint32_t trace_points_size;
 	trace_point_t *trace_points;
-	u32 trace_history_size;
-	u32 *trace_history;
-	u32 trace_history_pos;
+	uint32_t trace_history_size;
+	uint32_t *trace_history;
+	uint32_t trace_history_pos;
 	int trace_history_overflowed;
 } trace_t;
 
@@ -50,8 +51,8 @@ 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_s *target, uint32_t number);
+int trace_register_commands(struct command_context_s *cmd_ctx);
 
 #define ERROR_TRACE_IMAGE_UNAVAILABLE		-(1500)
 #define ERROR_TRACE_INSTRUCTION_UNAVAILABLE	-(1501)