From 78c6b922e21849ed8a2d3af4ca55c84c3d1ac185 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Fri, 13 Nov 2009 16:26:39 -0800 Subject: ETM: simplify ETM initialization code paths Return NULL from etm_build_reg_cache() not ERROR_OK; and share code on that fault path. Let ETM code handle any tracking of its cache -- not callers. Signed-off-by: David Brownell --- src/target/arm9tdmi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/target/arm9tdmi.c') diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 147c0903..fc110733 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -759,12 +759,10 @@ int arm9tdmi_examine(struct target *target) arm7_9->eice_cache = (*cache_p); if (arm7_9->armv4_5_common.etm) - { - struct arm_jtag *jtag_info = &arm7_9->jtag_info; (*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; - } + &arm7_9->jtag_info, + arm7_9->armv4_5_common.etm); + target_set_examined(target); } if ((retval = embeddedice_setup(target)) != ERROR_OK) -- cgit v1.2.3