X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.h;h=b75aae62446505ecc0cacf198acaffdb63597382;hb=ed8fd94d7ca0fc0682de4020501afae89f31ccc3;hp=18ad8d3cc97a2d4e99f7688b7fe06e6a6412a8ce;hpb=a71ca65c53b4854e11363b16aea0db3ca149b5a8;p=fw%2Fopenocd

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 18ad8d3cc..b75aae624 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;
 
@@ -30,43 +30,40 @@ 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
 {
-	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;
+	uint32_t address;
 	int length;
-	u32 mask;
-	u32 value;
+	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 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);
+extern int breakpoint_add(struct target_s *target, uint32_t address, uint32_t length, enum breakpoint_type type);
+extern void breakpoint_remove(struct target_s *target, uint32_t address);
+extern breakpoint_t* breakpoint_find(struct target_s *target, uint32_t address);
+extern int watchpoint_add(struct target_s *target, uint32_t address, uint32_t length, enum watchpoint_rw rw, uint32_t value, uint32_t mask);
+extern void watchpoint_remove(struct target_s *target, uint32_t address);
 extern void watchpoint_clear_target(struct target_s *target);
 
 #endif /* BREAKPOINTS_H */
-