diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-13 16:26:39 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-13 16:26:39 -0800 |
| commit | 78c6b922e21849ed8a2d3af4ca55c84c3d1ac185 (patch) | |
| tree | 054b5f97f2b849e3aef93b51681d200cb94f75aa /src/target/arm7tdmi.c | |
| parent | a7f5cdf999cd3fb8d3a681bcb6d8f8880faf8a11 (diff) | |
| download | openocd+libswd-78c6b922e21849ed8a2d3af4ca55c84c3d1ac185.tar.gz openocd+libswd-78c6b922e21849ed8a2d3af4ca55c84c3d1ac185.tar.bz2 openocd+libswd-78c6b922e21849ed8a2d3af4ca55c84c3d1ac185.tar.xz openocd+libswd-78c6b922e21849ed8a2d3af4ca55c84c3d1ac185.zip | |
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 <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm7tdmi.c')
| -rw-r--r-- | src/target/arm7tdmi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 029dce1c..c7bbd776 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -664,12 +664,10 @@ int arm7tdmi_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) |