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 | aafb916bea1153b8d2f4706e4a62628f49741133 (patch) | |
tree | 3bcb9b5cd83be6898a0958a02a91b1a5dc615abf /src/target/arm9tdmi.c | |
parent | 78c6b922e21849ed8a2d3af4ca55c84c3d1ac185 (diff) |
ARM7/ARM9: use shared examine() method
No point in having two identical examine methods for the
ARM7TDMI and ARM9TDMI drivers; move, rename, shrink, share.
Add a bit of doxygen; stop needlessly exporting a method.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm9tdmi.c')
-rw-r--r-- | src/target/arm9tdmi.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index fc110733..44a978ad 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -742,41 +742,6 @@ static void arm9tdmi_build_reg_cache(struct target *target) armv4_5->core_cache = (*cache_p); } -int arm9tdmi_examine(struct target *target) -{ - int retval; - struct arm7_9_common *arm7_9 = target_to_arm7_9(target); - - if (!target_was_examined(target)) - { - struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache); - struct reg_cache *t; - /* one extra register (vector catch) */ - t = embeddedice_build_reg_cache(target, arm7_9); - if (t == NULL) - return ERROR_FAIL; - (*cache_p) = t; - arm7_9->eice_cache = (*cache_p); - - if (arm7_9->armv4_5_common.etm) - (*cache_p)->next = etm_build_reg_cache(target, - &arm7_9->jtag_info, - arm7_9->armv4_5_common.etm); - - target_set_examined(target); - } - if ((retval = embeddedice_setup(target)) != ERROR_OK) - return retval; - if ((retval = arm7_9_setup(target)) != ERROR_OK) - return retval; - if (arm7_9->armv4_5_common.etm) - { - if ((retval = etm_setup(target)) != ERROR_OK) - return retval; - } - return ERROR_OK; -} - int arm9tdmi_init_target(struct command_context *cmd_ctx, struct target *target) { @@ -986,5 +951,5 @@ struct target_type arm9tdmi_target = .register_commands = arm9tdmi_register_commands, .target_create = arm9tdmi_target_create, .init_target = arm9tdmi_init_target, - .examine = arm9tdmi_examine, + .examine = arm7_9_examine, }; |