interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

David Brownell <david-b@pacbell.net> Fix segv in jtag_examine_chain(): exit loop on no-tap. Keep 

"next iteration" step with the rest of the loop overhead.

Cleanup:  remove spurious whitespace, and an overlong line;
only assign "tap->hasidcode" once.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2631 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-08-26 19:06:56 +00:00
parent 0de530067f
commit dce1cdc9fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jtag/core.c
View File

@ -975,10 +975,12 @@ int jtag_examine_chain(void)
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
for (unsigned bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;) for (unsigned bit_count = 0;
tap && bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;
tap = jtag_tap_next_enabled(tap))
{ {
uint32_t idcode = buf_get_u32(idcode_buffer, bit_count, 32); uint32_t idcode = buf_get_u32(idcode_buffer, bit_count, 32);
tap->hasidcode = true;
if ((idcode & 1) == 0) if ((idcode & 1) == 0)
{ {
/* LSB must not be 0, this indicates a device in bypass */ /* LSB must not be 0, this indicates a device in bypass */
@ -990,7 +992,9 @@ int jtag_examine_chain(void)
} }
else else
{ {
/* tap->hasidcode = true;
/*
* End of chain (invalid manufacturer ID) some devices, such * End of chain (invalid manufacturer ID) some devices, such
* as AVR will output all 1's instead of TDI input value at * as AVR will output all 1's instead of TDI input value at
* end of chain. * end of chain.
@ -1015,10 +1019,8 @@ int jtag_examine_chain(void)
tap->idcode = idcode; tap->idcode = idcode;
// ensure the TAP ID does matches what was expected // ensure the TAP ID does matches what was expected
if (!jtag_examine_chain_match_tap(tap)) if (!jtag_examine_chain_match_tap(tap))
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
tap = jtag_tap_next_enabled(tap);
} }
/* see if number of discovered devices matches configuration */ /* see if number of discovered devices matches configuration */