X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=a975b5f3b867ada7ef741eb317c3178dc72c723b;hb=f809ee69357b1968443c58c7df91897249e0bc3f;hp=de6021072affdc374b15fe2613aa376ef7eff47c;hpb=526fe3d83e118d87af34353a7140c02f3f1a3c19;p=openocd.git

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index de6021072a..a975b5f3b8 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -2,9 +2,15 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
+ *   Copyright (C) 2008 by Hongtao Zheng                                   *
+ *   hontor@126.com                                                        *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -41,11 +47,13 @@ typedef struct arm7_9_common_s
 	
 	u32 arm_bkpt;
 	u16 thumb_bkpt;
-	int sw_bkpts_use_wp;
+	int sw_breakpoints_added;
+	int breakpoint_count;
 	int wp_available;
+	int wp_available_max;
 	int wp0_used;
 	int wp1_used;
-	int sw_bkpts_enabled;
+	int wp1_used_default;
 	int force_hw_bkpts;
 	int dbgreq_adjust_pc;
 	int use_dbgrq;
@@ -88,7 +96,7 @@ typedef struct arm7_9_common_s
 	void (*branch_resume)(target_t *target);
 	void (*branch_resume_thumb)(target_t *target);
 	
-	void (*enable_single_step)(target_t *target);
+	void (*enable_single_step)(target_t *target, u32 next_pc);
 	void (*disable_single_step)(target_t *target);
 	
 	void (*set_special_dbgrq)(target_t *target);
@@ -138,7 +146,7 @@ int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
 int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
 int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
 
-void arm7_9_enable_eice_step(target_t *target);
+void arm7_9_enable_eice_step(target_t *target, u32 next_pc);
 void arm7_9_disable_eice_step(target_t *target);
 
 int arm7_9_execute_sys_speed(struct target_s *target);