summaryrefslogtreecommitdiff
path: root/src/jtag/core.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2009-10-09 09:14:27 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2009-10-09 09:14:27 +0200
commit20a3b14828c5015647fa438e0cbee84685bcdf5f (patch)
treebda0e74286ee254951492546f2d883f0fbb81bd6 /src/jtag/core.c
parentbffe824df6f92a2e88932c9b6d01b26b3a0cc598 (diff)
parent60e24aa597cde2703e933759aebff5d3c2dde314 (diff)
downloadopenocd+libswd-20a3b14828c5015647fa438e0cbee84685bcdf5f.tar.gz
openocd+libswd-20a3b14828c5015647fa438e0cbee84685bcdf5f.tar.bz2
openocd+libswd-20a3b14828c5015647fa438e0cbee84685bcdf5f.tar.xz
openocd+libswd-20a3b14828c5015647fa438e0cbee84685bcdf5f.zip
Merge commit 'origin/master'
Diffstat (limited to 'src/jtag/core.c')
-rw-r--r--src/jtag/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c
index bdfd6e5b..1c9d13c9 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -973,8 +973,9 @@ static bool jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
for (; count < max - 31; count += 32)
{
uint32_t idcode = buf_get_u32(idcodes, count, 32);
- // do not trigger the warning if the data looks good
- if (!triggered && jtag_idcode_is_final(idcode))
+
+ /* do not trigger the warning if the data looks good */
+ if (jtag_idcode_is_final(idcode))
continue;
LOG_WARNING("Unexpected idcode after end of chain: %d 0x%08x",
count, (unsigned int)idcode);
@@ -1027,6 +1028,7 @@ static int jtag_examine_chain(void)
/* DR scan to collect BYPASS or IDCODE register contents.
* Then make sure the scan data has both ones and zeroes.
*/
+ LOG_DEBUG("DR scan interrogation for IDCODE/BYPASS");
retval = jtag_examine_chain_execute(idcode_buffer, JTAG_MAX_CHAIN_SIZE);
if (retval != ERROR_OK)
return retval;