- reverted resume_target to old behaviour

[fw/openocd] / src / target / arm7_9_common.h

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 9d11dc2a601edbdab97af5ee4a210fd206a768e7..df2763d438bdb7ce29bc1113823a9a47d26df9e8 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -46,6 +46,7 @@ typedef struct arm7_9_common_s
        int force_hw_bkpts;
        int dbgreq_adjust_pc;
        int use_dbgrq;
+       int need_bypass_before_restart;
        
        etm_context_t *etm_ctx;
        
@@ -53,7 +54,6 @@ typedef struct arm7_9_common_s
        int has_monitor_mode;
        int has_vector_catch;
        
-       int reinit_embeddedice;
        int debug_entry_from_reset;
        
        struct working_area_s *dcc_working_area;
@@ -88,6 +88,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);
        
@@ -101,10 +103,11 @@ 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);
@@ -115,6 +118,7 @@ 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);
@@ -122,6 +126,7 @@ int arm7_9_read_memory(struct target_s *target, u32 address, u32 size, u32 count
 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);