X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.h;h=51bd05abd83c2be21145396a418b5a54e1fcaf56;hb=a640f139baa9fe4f44d428b1e4e1a9da245532ca;hp=9b60254bb606a1e93956fd068ce561611959c91f;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd.git

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 9b60254bb6..51bd05abd8 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -13,59 +13,67 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef BREAKPOINTS_H
-#define BREAKPOINTS_H
 
-#include "target.h"
+#ifndef OPENOCD_TARGET_BREAKPOINTS_H
+#define OPENOCD_TARGET_BREAKPOINTS_H
 
-struct target_s;
+#include <stdint.h>
 
-enum breakpoint_type
-{
+struct target;
+
+enum breakpoint_type {
 	BKPT_HARD,
 	BKPT_SOFT,
 };
 
-extern char *breakpoint_type_strings[];
-
-enum watchpoint_rw
-{
+enum watchpoint_rw {
 	WPT_READ = 0, WPT_WRITE = 1, WPT_ACCESS = 2
 };
 
-extern char *watchpoint_rw_strings[];
-
-typedef struct breakpoint_s
-{
-	u32 address;
+struct breakpoint {
+	target_addr_t address;
+	uint32_t asid;
 	int length;
 	enum breakpoint_type type;
 	int set;
-	u8 *orig_instr;
-	struct breakpoint_s *next;
-} breakpoint_t;
+	uint8_t *orig_instr;
+	struct breakpoint *next;
+	uint32_t unique_id;
+	int linked_BRP;
+};
 
-typedef struct watchpoint_s
-{
-	u32 address;
-	int length;
-	u32 mask;
-	u32 value;
+struct watchpoint {
+	target_addr_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;
+};
+
+void breakpoint_clear_target(struct target *target);
+int breakpoint_add(struct target *target,
+		target_addr_t address, uint32_t length, enum breakpoint_type type);
+int context_breakpoint_add(struct target *target,
+		uint32_t asid, uint32_t length, enum breakpoint_type type);
+int hybrid_breakpoint_add(struct target *target,
+		target_addr_t address, uint32_t asid, uint32_t length, enum breakpoint_type type);
+void breakpoint_remove(struct target *target, target_addr_t address);
+
+struct breakpoint *breakpoint_find(struct target *target, target_addr_t address);
+
+void watchpoint_clear_target(struct target *target);
+int watchpoint_add(struct target *target,
+		target_addr_t address, uint32_t length,
+		enum watchpoint_rw rw, uint32_t value, uint32_t mask);
+void watchpoint_remove(struct target *target, target_addr_t address);
 
-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);
+/* report type and address of just hit watchpoint */
+int watchpoint_hit(struct target *target, enum watchpoint_rw *rw,
+		target_addr_t *address);
 
-#endif /* BREAKPOINTS_H */
+#endif /* OPENOCD_TARGET_BREAKPOINTS_H */