X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.h;h=781c91b6b8d69db72d5535a30fdaeef4bc9440e5;hb=3885ab5a5af7ece410ce3eeb1059da3ea950436a;hp=800e6558e80a64767b3c8daed90b24b597193e01;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa;p=openocd.git

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 800e6558e8..781c91b6b8 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -20,7 +20,7 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "target.h"
+#include "types.h"
 
 struct target_s;
 
@@ -37,31 +37,38 @@ enum watchpoint_rw
 
 typedef struct breakpoint_s
 {
-	u32 address;
+	uint32_t address;
 	int length;
 	enum breakpoint_type type;
 	int set;
-	u8 *orig_instr;
+	uint8_t *orig_instr;
 	struct breakpoint_s *next;
+	int unique_id;
 } breakpoint_t;
 
 typedef struct watchpoint_s
 {
-	u32 address;
-	int length;
-	u32 mask;
-	u32 value;
+	uint32_t address;
+	uint32_t length;
+	uint32_t mask;
+	uint32_t value;
 	enum watchpoint_rw rw;
 	int set;
 	struct watchpoint_s *next;
+	int unique_id;
 } watchpoint_t;
 
-extern void breakpoint_clear_target(struct target_s *target);
-extern int breakpoint_add(struct target_s *target, u32 address, u32 length, enum breakpoint_type type);
-extern void breakpoint_remove(struct target_s *target, u32 address);
-extern breakpoint_t* breakpoint_find(struct target_s *target, u32 address);
-extern int watchpoint_add(struct target_s *target, u32 address, u32 length, enum watchpoint_rw rw, u32 value, u32 mask);
-extern void watchpoint_remove(struct target_s *target, u32 address);
-extern void watchpoint_clear_target(struct target_s *target);
+void breakpoint_clear_target(struct target_s *target);
+int breakpoint_add(struct target_s *target,
+		uint32_t address, uint32_t length, enum breakpoint_type type);
+void breakpoint_remove(struct target_s *target, uint32_t address);
+
+breakpoint_t* breakpoint_find(struct target_s *target, uint32_t address);
+
+void watchpoint_clear_target(struct target_s *target);
+int watchpoint_add(struct target_s *target,
+		uint32_t address, uint32_t length,
+		enum watchpoint_rw rw, uint32_t value, uint32_t mask);
+void watchpoint_remove(struct target_s *target, uint32_t address);
 
 #endif /* BREAKPOINTS_H */