- split fileio handling into fileio part and image handling

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

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 5e7d54a9ca6b050832e009942f684d27635dfed4..fbcb920dc51ae162bf88be00c5f25c97effaf512 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -25,7 +25,7 @@
 #include "breakpoints.h"
 #include "target.h"
 
-#include "etb.h"
+#include "etm.h"
 
 #define        ARM7_9_COMMON_MAGIC 0x0a790a79
 
@@ -35,7 +35,6 @@ 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;
@@ -48,8 +47,8 @@ typedef struct arm7_9_common_s
        int dbgreq_adjust_pc;
        int use_dbgrq;
        
-       int has_etm;
-       etb_t *etb;
+       etm_context_t *etm_ctx;
+       
        int has_single_step;
        int has_monitor_mode;
        int has_vector_catch;
@@ -134,6 +133,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 */