From d8de4b9bab6c0abbf2f685345b2b2696508db7c1 Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 21 May 2008 07:28:33 +0000 Subject: moved srst_pulls_trst check into arm7_9_common.c. Not tested yet, if it is broken it should "only" print bogus warnings or not print a warning when it should have. git-svn-id: svn://svn.berlios.de/openocd/trunk@670 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/arm7_9_common.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/target/arm7_9_common.c') diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index 249d8d4c..517badfd 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -693,10 +693,33 @@ int arm7_9_poll(target_t *target) } if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET)) { + int check_pc=0; target->state = TARGET_HALTED; + + if (target->state == TARGET_RESET) + { + if ((target->reset_mode == RESET_HALT) || (target->reset_mode == RESET_INIT)) + { + if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) + { + check_pc = 1; + } + } + } + if ((retval = arm7_9_debug_entry(target)) != ERROR_OK) return retval; + if (check_pc) + { + reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1); + u32 t=*((u32 *)reg->value); + if (t!=0) + { + LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?"); + } + } + target_call_event_callbacks(target, TARGET_EVENT_HALTED); } if (target->state == TARGET_DEBUG_RUNNING) -- cgit v1.2.3