X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm7tdmi.c;h=f58ffe282fd396b8f9ad86aa85515420f203b712;hb=5eb638c71e95048b090b8a19640d7d4902c07902;hp=8b929d49b1aad26a33f06cb379a0567e40033055;hpb=fec3c4763ad4cf2996fa138c4fd0f555e32e5e9f;p=openocd.git

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 8b929d49b1..f58ffe282f 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -663,11 +663,12 @@ int arm7tdmi_examine(struct target_s *target)
 		(*cache_p) = t;
 		arm7_9->eice_cache = (*cache_p);
 
-		if (arm7_9->etm_ctx)
+		if (arm7_9->armv4_5_common.etm)
 		{
 			arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-			(*cache_p)->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx);
-			arm7_9->etm_ctx->reg_cache = (*cache_p)->next;
+			(*cache_p)->next = etm_build_reg_cache(target,
+					jtag_info, arm7_9->armv4_5_common.etm);
+			arm7_9->armv4_5_common.etm->reg_cache = (*cache_p)->next;
 		}
 		target_set_examined(target);
 	}
@@ -675,7 +676,7 @@ int arm7tdmi_examine(struct target_s *target)
 		return retval;
 	if ((retval = arm7_9_setup(target)) != ERROR_OK)
 		return retval;
-	if (arm7_9->etm_ctx)
+	if (arm7_9->armv4_5_common.etm)
 	{
 		if ((retval = etm_setup(target)) != ERROR_OK)
 			return retval;