summaryrefslogtreecommitdiff
path: root/src/target/cortex_m3.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-07 21:49:16 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-07 21:49:16 +0000
commitc78b4fe426c35f638e5575b59ec89d0e794263af (patch)
treea2f9b71545a8c90b2a91967f2d263238e456742a /src/target/cortex_m3.c
parent29fc9b2596a4c92c5512d305b1addb4a8c224e26 (diff)
downloadopenocd+libswd-c78b4fe426c35f638e5575b59ec89d0e794263af.tar.gz
openocd+libswd-c78b4fe426c35f638e5575b59ec89d0e794263af.tar.bz2
openocd+libswd-c78b4fe426c35f638e5575b59ec89d0e794263af.tar.xz
openocd+libswd-c78b4fe426c35f638e5575b59ec89d0e794263af.zip
- Improves error handling upon GDB connect
- switch to synchronous halt during connect. This fixes the bug where poll() was not invoked between halt() and servicing the 'g' register packet - halt() no longer returns error code when target is already halted, just logs a warning. Only the halt() implementation can say anything meaningful about why a halt() failed, so error messages are pushed up to halt() - fixed soft_reset_halt infinite loop bug in arm7_9_common.c. The rest of the implementations are still busted. - by using USER() instead of command_print() the log gets the source + line #. Nice. - no longer invoke exit() if soft_reset_halt fails. A reset can often fix the problem. git-svn-id: svn://svn.berlios.de/openocd/trunk@475 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/cortex_m3.c')
-rw-r--r--src/target/cortex_m3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 964c6b8c..51ec52e0 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -432,7 +432,7 @@ int cortex_m3_halt(target_t *target)
if (target->state == TARGET_HALTED)
{
WARNING("target was already halted");
- return ERROR_TARGET_ALREADY_HALTED;
+ return ERROR_OK;
}
if (target->state == TARGET_UNKNOWN)