X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.c;h=58b8efd001642bc07ee37a21fc3a8f5502186887;hp=9455c05c287c9b569166059548e559be5f5e243f;hb=3ae44019018b7fa9adbe7dcf49c2b79e8e11acea;hpb=4b20ed6b5cf6bc73471dec7d1604a4684d1fc2ca

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 9455c05c28..58b8efd001 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -758,11 +758,12 @@ int arm9tdmi_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);
 	}
@@ -770,7 +771,7 @@ int arm9tdmi_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;