ETM: update arm[79]tdmi_examine()

Make ARM7 and ARM9 cores use the new toplevel ETM handle to
trigger ETM setup, not the to-be-removed lower level one.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

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;

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;