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

diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index ee4d9d1359..51bd05abd8 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -13,42 +13,39 @@
  *   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 <helper/types.h>
+#ifndef OPENOCD_TARGET_BREAKPOINTS_H
+#define OPENOCD_TARGET_BREAKPOINTS_H
+
+#include <stdint.h>
 
 struct target;
 
-enum breakpoint_type
-{
+enum breakpoint_type {
 	BKPT_HARD,
 	BKPT_SOFT,
 };
 
-enum watchpoint_rw
-{
+enum watchpoint_rw {
 	WPT_READ = 0, WPT_WRITE = 1, WPT_ACCESS = 2
 };
 
-struct breakpoint
-{
-	uint32_t address;
+struct breakpoint {
+	target_addr_t address;
+	uint32_t asid;
 	int length;
 	enum breakpoint_type type;
 	int set;
 	uint8_t *orig_instr;
 	struct breakpoint *next;
-	int unique_id;
+	uint32_t unique_id;
+	int linked_BRP;
 };
 
-struct watchpoint
-{
-	uint32_t address;
+struct watchpoint {
+	target_addr_t address;
 	uint32_t length;
 	uint32_t mask;
 	uint32_t value;
@@ -60,15 +57,23 @@ struct watchpoint
 
 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 *target, uint32_t address);
+		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, uint32_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,
-		uint32_t address, uint32_t length,
+		target_addr_t address, uint32_t length,
 		enum watchpoint_rw rw, uint32_t value, uint32_t mask);
-void watchpoint_remove(struct target *target, uint32_t address);
+void watchpoint_remove(struct target *target, target_addr_t address);
+
+/* 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 */