X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.h;h=a65f20e373a9a8454cd7709b51a82163c26047c5;hb=9e9633c6b98cc9243ae78cd12ab657d041eaa73e;hp=7eba39aa3c1abaa04f9be136561500656107a541;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702;p=openocd.git

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 7eba39aa3c..a65f20e373 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -20,9 +20,9 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "target.h"
+#include "types.h"
 
-struct target_s;
+struct target;
 
 enum breakpoint_type
 {
@@ -30,41 +30,45 @@ enum breakpoint_type
 	BKPT_SOFT,
 };
 
-extern char *breakpoint_type_strings[];
-
 enum watchpoint_rw
 {
 	WPT_READ = 0, WPT_WRITE = 1, WPT_ACCESS = 2
 };
 
-extern char *watchpoint_rw_strings[];
-
-typedef struct breakpoint_s
+struct breakpoint
 {
-	u32 address;
+	uint32_t address;
 	int length;
 	enum breakpoint_type type;
 	int set;
-	u8 *orig_instr;
-	struct breakpoint_s *next;
-} breakpoint_t;
+	uint8_t *orig_instr;
+	struct breakpoint *next;
+	int unique_id;
+};
 
-typedef struct watchpoint_s
+struct watchpoint
 {
-	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;
-} watchpoint_t;
+	struct watchpoint *next;
+	int unique_id;
+};
 
-extern int breakpoint_add(struct target_s *target, u32 address, u32 length, enum breakpoint_type type);
-extern int 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 int watchpoint_remove(struct target_s *target, u32 address);
+void breakpoint_clear_target(struct target *target);
+int breakpoint_add(struct target *target,
+		uint32_t address, uint32_t length, enum breakpoint_type type);
+void breakpoint_remove(struct target *target, uint32_t address);
 
-#endif /* BREAKPOINTS_H */
+struct breakpoint* breakpoint_find(struct target *target, uint32_t address);
 
+void watchpoint_clear_target(struct target *target);
+int watchpoint_add(struct target *target,
+		uint32_t address, uint32_t length,
+		enum watchpoint_rw rw, uint32_t value, uint32_t mask);
+void watchpoint_remove(struct target *target, uint32_t address);
+
+#endif /* BREAKPOINTS_H */