X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.h;h=ee4d9d13596a18fc154c8606dccff7f7ade67cae;hb=796086cd49f769a55bebcdd43d2d348672c87371;hp=57c06c73e7780c5a64f1ae0e04085e622ace7471;hpb=72b421418f315cb54a01ba4d249082f989d5154a;p=openocd.git

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 57c06c73e7..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,16 +35,16 @@ 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;
+};
 
 struct watchpoint
 {
@@ -58,17 +58,17 @@ struct watchpoint
 	int unique_id;
 };
 
-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 */