X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=fbcb920dc51ae162bf88be00c5f25c97effaf512;hp=e77bedac0190da377837d8944b2f206ea9cded30;hb=237e894805dd757cc24029af1b4b1e824c51712b;hpb=22bc5194ae101282cf5c30d681d7f4720bec2534

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index e77bedac01..fbcb920dc5 100644
--- 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;