diff options
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/arm7_9_common.c | 3 | ||||
| -rw-r--r-- | src/target/cortex_m3.c | 3 | ||||
| -rw-r--r-- | src/target/mips_m4k.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index 9ec3e6c8..493cf02d 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -905,6 +905,7 @@ int arm7_9_poll(target_t *target) { if (target->reset_halt) { + enum reset_types jtag_reset_config = jtag_get_reset_config(); if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) { check_pc = 1; @@ -975,6 +976,7 @@ int arm7_9_assert_reset(target_t *target) LOG_DEBUG("target->state: %s", Jim_Nvp_value2name_simple( nvp_target_state,target->state)->name); + enum reset_types jtag_reset_config = jtag_get_reset_config(); if (!(jtag_reset_config & RESET_HAS_SRST)) { LOG_ERROR("Can't assert SRST"); @@ -1047,6 +1049,7 @@ int arm7_9_deassert_reset(target_t *target) /* deassert reset lines */ jtag_add_reset(0, 0); + enum reset_types jtag_reset_config = jtag_get_reset_config(); if (target->reset_halt&&(jtag_reset_config & RESET_SRST_PULLS_TRST)!=0) { LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset."); diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index efa94ea4..ab2c8f8e 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -544,7 +544,7 @@ int cortex_m3_halt(target_t *target) if (target->state == TARGET_RESET) { - if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_get_srst()) + if ((jtag_get_reset_config() & RESET_SRST_PULLS_TRST) && jtag_get_srst()) { LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST"); return ERROR_TARGET_FAILURE; @@ -753,6 +753,7 @@ int cortex_m3_assert_reset(target_t *target) LOG_DEBUG("target->state: %s", Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); + enum reset_types jtag_reset_config = jtag_get_reset_config(); if (!(jtag_reset_config & RESET_HAS_SRST)) { LOG_ERROR("Can't assert SRST"); diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 466e0a2d..5e98a2a0 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -235,7 +235,7 @@ int mips_m4k_halt(struct target_s *target) if (target->state == TARGET_RESET) { - if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_get_srst()) + if ((jtag_get_reset_config() & RESET_SRST_PULLS_TRST) && jtag_get_srst()) { LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST"); return ERROR_TARGET_FAILURE; @@ -267,6 +267,7 @@ int mips_m4k_assert_reset(target_t *target) LOG_DEBUG("target->state: %s", Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name); + enum reset_types jtag_reset_config = jtag_get_reset_config(); if (!(jtag_reset_config & RESET_HAS_SRST)) { LOG_ERROR("Can't assert SRST"); |