diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2021-07-03 22:10:55 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-07-24 10:38:19 +0100 |
| commit | 54e699b2601036e384a124657aa1fbdd9ff2dc87 (patch) | |
| tree | 69bb8d7842b6a8eb23d005fc51a1f414038d99a0 /src/jtag/core.c | |
| parent | 0a1f904707fa3c170032dd9dba8f2ef9207ff9b2 (diff) | |
| download | riscv-openocd-54e699b2601036e384a124657aa1fbdd9ff2dc87.zip riscv-openocd-54e699b2601036e384a124657aa1fbdd9ff2dc87.tar.gz riscv-openocd-54e699b2601036e384a124657aa1fbdd9ff2dc87.tar.bz2 | |
openocd: manually remove NULL comparisons
For the remaining NULL comparisons, remove then manually.
While there, make more readable a loop, by moving the assigment
out of the loop condition.
Change-Id: I44193aaa95813156a3a79c16b80e1ad333dc1eaf
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6353
Tested-by: jenkins
Diffstat (limited to 'src/jtag/core.c')
| -rw-r--r-- | src/jtag/core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index 51c1228..1406238 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1336,7 +1336,6 @@ out: static int jtag_validate_ircapture(void) { struct jtag_tap *tap; - int total_ir_length = 0; uint8_t *ir_test = NULL; struct scan_field field; uint64_t val; @@ -1344,11 +1343,12 @@ static int jtag_validate_ircapture(void) int retval; /* when autoprobing, accommodate huge IR lengths */ - for (tap = NULL, total_ir_length = 0; - (tap = jtag_tap_next_enabled(tap)) != NULL; - total_ir_length += tap->ir_length) { + int total_ir_length = 0; + for (tap = jtag_tap_next_enabled(NULL); tap; tap = jtag_tap_next_enabled(tap)) { if (tap->ir_length == 0) total_ir_length += JTAG_IRLEN_MAX; + else + total_ir_length += tap->ir_length; } /* increase length to add 2 bit sentinel after scan */ @@ -2008,7 +2008,7 @@ bool transport_is_jtag(void) int adapter_resets(int trst, int srst) { - if (get_current_transport() == NULL) { + if (!get_current_transport()) { LOG_ERROR("transport is not selected"); return ERROR_FAIL; } @@ -2065,7 +2065,7 @@ int adapter_assert_reset(void) transport_is_dapdirect_jtag() || transport_is_dapdirect_swd() || transport_is_swim()) return adapter_system_reset(1); - else if (get_current_transport() != NULL) + else if (get_current_transport()) LOG_ERROR("reset is not supported on %s", get_current_transport()->name); else @@ -2082,7 +2082,7 @@ int adapter_deassert_reset(void) transport_is_dapdirect_jtag() || transport_is_dapdirect_swd() || transport_is_swim()) return adapter_system_reset(0); - else if (get_current_transport() != NULL) + else if (get_current_transport()) LOG_ERROR("reset is not supported on %s", get_current_transport()->name); else |