diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-11 21:50:10 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-11 21:50:10 -0800 |
| commit | 3ae44019018b7fa9adbe7dcf49c2b79e8e11acea (patch) | |
| tree | 7faf32de73d8a7377704dfcda6c376e18ec2ea5b | |
| parent | 4b20ed6b5cf6bc73471dec7d1604a4684d1fc2ca (diff) | |
| download | openocd_libswd-3ae44019018b7fa9adbe7dcf49c2b79e8e11acea.tar.gz openocd_libswd-3ae44019018b7fa9adbe7dcf49c2b79e8e11acea.tar.bz2 openocd_libswd-3ae44019018b7fa9adbe7dcf49c2b79e8e11acea.tar.xz openocd_libswd-3ae44019018b7fa9adbe7dcf49c2b79e8e11acea.zip | |
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>
| -rw-r--r-- | src/target/arm7tdmi.c | 9 | ||||
| -rw-r--r-- | src/target/arm9tdmi.c | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 8b929d49..f58ffe28 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; diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 9455c05c..58b8efd0 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; |