X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=73d8f59e4704f7c8ac963d29549b8dbb8e4c5035;hb=11ce572bbed985819989e80dff8d6402fd95b673;hp=fc90c05912ba7cb77073b77ec7f6c82847624e78;hpb=03e8f264f4c66baec9b86778d3488b23e0a8c0b6;p=fw%2Fopenocd

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index fc90c0591..73d8f59e4 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   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     *
@@ -25,6 +31,8 @@
 #include "breakpoints.h"
 #include "target.h"
 
+#include "etm.h"
+
 #define	ARM7_9_COMMON_MAGIC 0x0a790a79
 
 typedef struct arm7_9_common_s
@@ -33,21 +41,28 @@ typedef struct arm7_9_common_s
 	
 	arm_jtag_t jtag_info;
 	reg_cache_t *eice_cache;
-	reg_cache_t *etm_cache;
 	
 	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;
-	int has_etm;
+	int need_bypass_before_restart;
+	
+	etm_context_t *etm_ctx;
 	
-	int reinit_embeddedice;
+	int has_single_step;
+	int has_monitor_mode;
+	int has_vector_catch;
+	
+	int debug_entry_from_reset;
 	
 	struct working_area_s *dcc_working_area;
 	
@@ -81,6 +96,8 @@ typedef struct arm7_9_common_s
 	void (*enable_single_step)(target_t *target);
 	void (*disable_single_step)(target_t *target);
 	
+	void (*set_special_dbgrq)(target_t *target);
+
 	void (*pre_debug_entry)(target_t *target);
 	void (*post_debug_entry)(target_t *target);
 	
@@ -94,23 +111,30 @@ typedef struct arm7_9_common_s
 
 int arm7_9_register_commands(struct command_context_s *cmd_ctx);
 
-enum target_state arm7_9_poll(target_t *target);
+int arm7_9_poll(target_t *target);
+
+int arm7_9_target_request_data(target_t *target, u32 size, u8 *buffer);
 
+int arm7_9_setup(target_t *target);
 int arm7_9_assert_reset(target_t *target);
 int arm7_9_deassert_reset(target_t *target);
 int arm7_9_reset_request_halt(target_t *target);
 int arm7_9_early_halt(target_t *target);
 int arm7_9_soft_reset_halt(struct target_s *target);
+int arm7_9_prepare_reset_halt(struct target_s *target);
 
 int arm7_9_halt(target_t *target);
 int arm7_9_debug_entry(target_t *target);
 int arm7_9_full_context(target_t *target);
+int arm7_9_restore_context(target_t *target);
 int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution);
 int arm7_9_step(struct target_s *target, int current, u32 address, int handle_breakpoints);
 int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mode);
 int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm7_9_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
+int arm7_9_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum);
+int arm7_9_blank_check_memory(struct target_s *target, u32 address, u32 count, u32* blank);
 
 int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_prams, reg_param_t *reg_param, u32 entry_point, void *arch_info);
 
@@ -125,6 +149,7 @@ void arm7_9_disable_eice_step(target_t *target);
 int arm7_9_execute_sys_speed(struct target_s *target);
 
 int arm7_9_init_arch_info(target_t *target, arm7_9_common_t *arm7_9);
+int arm7_9_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, arm7_9_common_t **arm7_9_p);
 
 
 #endif /* ARM7_9_COMMON_H */