in_handler in_check_mask and in_check_value now removed from field. Last big patch...

[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 73d8f59e4704f7c8ac963d29549b8dbb8e4c5035..9b497edce385b72f530b8b96d1007fccb9246383 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -8,6 +8,9 @@
  *   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     *
@@ -37,7 +40,7 @@
 
 typedef struct arm7_9_common_s
 {
-       int common_magic;
+       u32 common_magic;
        
        arm_jtag_t jtag_info;
        reg_cache_t *eice_cache;
@@ -93,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);
@@ -124,7 +127,6 @@ 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);
@@ -143,7 +145,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);
@@ -151,5 +153,4 @@ 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 */