diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-06-18 11:58:20 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-06-18 11:58:20 +0000 |
| commit | 5728fdce2147e4b39f2c4930f3d58b2adee3514a (patch) | |
| tree | cd8023de55e72f2de3ded92963c24c8e461aed3f /src/target/arm7_9_common.c | |
| parent | 681981cc0bf0e63a6a085baac154ca5049755879 (diff) | |
| download | openocd+libswd-5728fdce2147e4b39f2c4930f3d58b2adee3514a.tar.gz openocd+libswd-5728fdce2147e4b39f2c4930f3d58b2adee3514a.tar.bz2 openocd+libswd-5728fdce2147e4b39f2c4930f3d58b2adee3514a.tar.xz openocd+libswd-5728fdce2147e4b39f2c4930f3d58b2adee3514a.zip | |
Spen spotted a bug in warning for missing srst_pulls_trst
git-svn-id: svn://svn.berlios.de/openocd/trunk@714 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/arm7_9_common.c')
| -rw-r--r-- | src/target/arm7_9_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index ad184f21..9da9c5a4 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -702,8 +702,6 @@ 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)) @@ -715,6 +713,8 @@ int arm7_9_poll(target_t *target) } } + target->state = TARGET_HALTED; + if ((retval = arm7_9_debug_entry(target)) != ERROR_OK) return retval; @@ -724,7 +724,7 @@ int arm7_9_poll(target_t *target) u32 t=*((u32 *)reg->value); if (t!=0) { - LOG_ERROR("PC was not 0. Does this target does target need srst_pulls_trst?"); + LOG_ERROR("PC was not 0. Does this target need srst_pulls_trst?"); } } |