diff options
| author | Tim Newsome <tim@sifive.com> | 2020-10-15 12:32:45 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2020-10-15 12:32:45 -0700 |
| commit | 7a933ea7ad05b5c0aa155a16c74f6c02f84ee022 (patch) | |
| tree | 79296e4ab43b43357ee2e7504c051958b8b12bba /src/jtag/drivers/ftdi.c | |
| parent | fb477376da7eddf0e9cf0dc1ad828527499127b3 (diff) | |
| parent | 4fc61a2f9d60e49b8134ab7e0929cfb2b3a4f771 (diff) | |
| download | riscv-openocd-7a933ea7ad05b5c0aa155a16c74f6c02f84ee022.zip riscv-openocd-7a933ea7ad05b5c0aa155a16c74f6c02f84ee022.tar.gz riscv-openocd-7a933ea7ad05b5c0aa155a16c74f6c02f84ee022.tar.bz2 | |
Merge branch 'master' into from_upstream_histogram
Used histogram diff strategy, which was much better than the default.
Conflicts:
doc/openocd.texi
src/flash/nor/fespi.c
src/jtag/drivers/libjaylink
src/rtos/rtos.c
src/target/riscv/batch.c
src/target/riscv/encoding.h
src/target/riscv/riscv-011.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
src/target/riscv/riscv.h
src/target/target.c
tcl/target/gd32vf103.cfg
Change-Id: I1321f62ba719419e58f93b2195f2540bd62f50d2
Diffstat (limited to 'src/jtag/drivers/ftdi.c')
| -rw-r--r-- | src/jtag/drivers/ftdi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c index 34b42b8..a92f166 100644 --- a/src/jtag/drivers/ftdi.c +++ b/src/jtag/drivers/ftdi.c @@ -620,11 +620,11 @@ static int ftdi_reset(int trst, int srst) static void ftdi_execute_sleep(struct jtag_command *cmd) { - LOG_DEBUG_IO("sleep %" PRIi32, cmd->cmd.sleep->us); + LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us); mpsse_flush(mpsse_ctx); jtag_sleep(cmd->cmd.sleep->us); - LOG_DEBUG_IO("sleep %" PRIi32 " usec while in %s", + LOG_DEBUG_IO("sleep %" PRIu32 " usec while in %s", cmd->cmd.sleep->us, tap_state_name(tap_get_state())); } @@ -1041,8 +1041,7 @@ static void oscan1_reset_online_activate(void) COMMAND_HANDLER(ftdi_handle_device_desc_command) { if (CMD_ARGC == 1) { - if (ftdi_device_desc) - free(ftdi_device_desc); + free(ftdi_device_desc); ftdi_device_desc = strdup(CMD_ARGV[0]); } else { LOG_ERROR("expected exactly one argument to ftdi_device_desc <description>"); @@ -1054,8 +1053,7 @@ COMMAND_HANDLER(ftdi_handle_device_desc_command) COMMAND_HANDLER(ftdi_handle_serial_command) { if (CMD_ARGC == 1) { - if (ftdi_serial) - free(ftdi_serial); + free(ftdi_serial); ftdi_serial = strdup(CMD_ARGV[0]); } else { return ERROR_COMMAND_SYNTAX_ERROR; |