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

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 781c91b6b8..ee4d9d1359 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -20,9 +20,9 @@
 #ifndef BREAKPOINTS_H
 #define BREAKPOINTS_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct target_s;
+struct target;
 
 enum breakpoint_type
 {
@@ -35,18 +35,18 @@ enum watchpoint_rw
 	WPT_READ = 0, WPT_WRITE = 1, WPT_ACCESS = 2
 };
 
-typedef struct breakpoint_s
+struct breakpoint
 {
 	uint32_t address;
 	int length;
 	enum breakpoint_type type;
 	int set;
 	uint8_t *orig_instr;
-	struct breakpoint_s *next;
+	struct breakpoint *next;
 	int unique_id;
-} breakpoint_t;
+};
 
-typedef struct watchpoint_s
+struct watchpoint
 {
 	uint32_t address;
 	uint32_t length;
@@ -54,21 +54,21 @@ typedef struct watchpoint_s
 	uint32_t value;
 	enum watchpoint_rw rw;
 	int set;
-	struct watchpoint_s *next;
+	struct watchpoint *next;
 	int unique_id;
-} watchpoint_t;
+};
 
-void breakpoint_clear_target(struct target_s *target);
-int breakpoint_add(struct target_s *target,
+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_s *target, uint32_t address);
+void breakpoint_remove(struct target *target, uint32_t address);
 
-breakpoint_t* breakpoint_find(struct target_s *target, uint32_t address);
+struct breakpoint* breakpoint_find(struct target *target, uint32_t address);
 
-void watchpoint_clear_target(struct target_s *target);
-int watchpoint_add(struct target_s *target,
+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_s *target, uint32_t address);
+void watchpoint_remove(struct target *target, uint32_t address);
 
 #endif /* BREAKPOINTS_H */