diff options
| -rw-r--r-- | src/target/arm7_9_common.c | 23 | ||||
| -rw-r--r-- | src/target/target.c | 10 |
2 files changed, 23 insertions, 10 deletions
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) diff --git a/src/target/target.c b/src/target/target.c index d1e80728..5b0457f5 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -225,16 +225,6 @@ int target_init_handler(struct target_s *target, enum target_event event, void * if ((event == TARGET_EVENT_HALTED) && (target->reset_script)) { - if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) - { - 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_unregister_event_callback(target_init_handler, priv); script = open_file_from_path(target->reset_script, "r"); |