summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-20 11:51:52 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-20 11:51:52 +0000
commitfe1f475e64aeb737ac43509a339dd6c810b27eea (patch)
tree62128edef177443b0dde8ac624596384974e346e
parentae86e921ebdeaa82559331ae528ef72d12022ae9 (diff)
downloadopenocd_libswd-fe1f475e64aeb737ac43509a339dd6c810b27eea.tar.gz
openocd_libswd-fe1f475e64aeb737ac43509a339dd6c810b27eea.tar.bz2
openocd_libswd-fe1f475e64aeb737ac43509a339dd6c810b27eea.tar.xz
openocd_libswd-fe1f475e64aeb737ac43509a339dd6c810b27eea.zip
continue execution even if chain can't be validated. This will, hopefully, give us some more feedback on what's wrong.
git-svn-id: svn://svn.berlios.de/openocd/trunk@953 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/jtag/jtag.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index d5158126..f777ebb8 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1554,7 +1554,6 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
static int jtag_init_inner(struct command_context_s *cmd_ctx)
{
- int validate_tries = 0;
jtag_device_t *device;
int retval;
@@ -1580,16 +1579,9 @@ static int jtag_init_inner(struct command_context_s *cmd_ctx)
LOG_ERROR("trying to validate configured JTAG chain anyway...");
}
- while (jtag_validate_chain() != ERROR_OK)
+ if (jtag_validate_chain() != ERROR_OK)
{
- validate_tries++;
-
- if (validate_tries > 5)
- {
- LOG_ERROR("Could not validate JTAG chain");
- return ERROR_JTAG_INVALID_INTERFACE;
- }
- alive_sleep(10);
+ LOG_ERROR("Could not validate JTAG chain, continuing anyway...");
}
return ERROR_OK;