summaryrefslogtreecommitdiff
path: root/src/target/arm926ejs.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/arm926ejs.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/arm926ejs.c')
-rw-r--r--src/target/arm926ejs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index ff73e1a1..1b3a17b0 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -578,10 +578,7 @@ int arm926ejs_soft_reset_halt(struct target_s *target)
arm926ejs_common_t *arm926ejs = arm9tdmi->arch_info;
reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
- if (target->state == TARGET_RUNNING)
- {
- target->type->halt(target);
- }
+ target->type->halt(target);
while (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) == 0)
{