interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify jtag_add_reset: 

- Use jtag_set_error instead of accessing jtag_error directly.
- Remove superfluous retval temporary variable.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2126 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-08 10:58:13 +00:00
parent 6f4de887f7
commit 8c21ca7e81
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jtag/jtag.c
View File

@ -665,7 +665,6 @@ void jtag_add_clocks(int num_cycles)
void jtag_add_reset(int req_tlr_or_trst, int req_srst) void jtag_add_reset(int req_tlr_or_trst, int req_srst)
{ {
int trst_with_tlr = 0; int trst_with_tlr = 0;
int retval;
/* FIX!!! there are *many* different cases here. A better /* FIX!!! there are *many* different cases here. A better
* approach is needed for legal combinations of transitions... * approach is needed for legal combinations of transitions...
@ -689,7 +688,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tlr_or_trst)) if (((jtag_reset_config & RESET_SRST_PULLS_TRST) && (req_srst == 1)) && (!req_tlr_or_trst))
{ {
LOG_ERROR("BUG: requested reset would assert trst"); LOG_ERROR("BUG: requested reset would assert trst");
jtag_error=ERROR_FAIL; jtag_set_error(ERROR_FAIL);
return; return;
} }
@ -702,7 +701,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
if (req_srst && !(jtag_reset_config & RESET_HAS_SRST)) if (req_srst && !(jtag_reset_config & RESET_HAS_SRST))
{ {
LOG_ERROR("BUG: requested SRST assertion, but the current configuration doesn't support this"); LOG_ERROR("BUG: requested SRST assertion, but the current configuration doesn't support this");
jtag_error=ERROR_FAIL; jtag_set_error(ERROR_FAIL);
return; return;
} }
@ -722,10 +721,10 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
jtag_srst = req_srst; jtag_srst = req_srst;
retval = interface_jtag_add_reset(jtag_trst, jtag_srst); int retval = interface_jtag_add_reset(jtag_trst, jtag_srst);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
jtag_error=retval; jtag_set_error(retval);
return; return;
} }
jtag_execute_queue(); jtag_execute_queue();