diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/core.c | 10 | ||||
| -rw-r--r-- | src/jtag/startup.tcl | 2 | ||||
| -rw-r--r-- | src/jtag/tcl.c | 20 |
3 files changed, 17 insertions, 15 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index bb11ff15..9792280b 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -95,7 +95,7 @@ static int jtag_verify = 1; /* how long the OpenOCD should wait before attempting JTAG communication after reset lines deasserted (in ms) */ static int adapter_nsrst_delay = 0; /* default to no nSRST delay */ static int jtag_ntrst_delay = 0; /* default to no nTRST delay */ -static int jtag_nsrst_assert_width = 0; /* width of assertion */ +static int adapter_nsrst_assert_width = 0; /* width of assertion */ static int jtag_ntrst_assert_width = 0; /* width of assertion */ /** @@ -699,8 +699,8 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) if (jtag_srst) { LOG_DEBUG("SRST line asserted"); - if (jtag_nsrst_assert_width) - jtag_add_sleep(jtag_nsrst_assert_width * 1000); + if (adapter_nsrst_assert_width) + jtag_add_sleep(adapter_nsrst_assert_width * 1000); } else { LOG_DEBUG("SRST line released"); @@ -1714,11 +1714,11 @@ unsigned jtag_get_ntrst_delay(void) void jtag_set_nsrst_assert_width(unsigned delay) { - jtag_nsrst_assert_width = delay; + adapter_nsrst_assert_width = delay; } unsigned jtag_get_nsrst_assert_width(void) { - return jtag_nsrst_assert_width; + return adapter_nsrst_assert_width; } void jtag_set_ntrst_assert_width(unsigned delay) { diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl index 42fbe4f6..3a36886d 100644 --- a/src/jtag/startup.tcl +++ b/src/jtag/startup.tcl @@ -84,4 +84,6 @@ proc srst_asserted {} { # proc jtag_khz args { eval adapter_khz $args } proc jtag_nsrst_delay args { eval adapter_nsrst_delay $args } +proc jtag_nsrst_assert_width args { eval adapter_nsrst_assert_width $args } + # END MIGRATION AIDS diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index d587922b..686eb3e8 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -1321,7 +1321,7 @@ COMMAND_HANDLER(handle_jtag_ntrst_delay_command) return ERROR_OK; } -COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command) +COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command) { if (CMD_ARGC > 1) return ERROR_COMMAND_SYNTAX_ERROR; @@ -1332,7 +1332,7 @@ COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command) jtag_set_nsrst_assert_width(delay); } - command_print(CMD_CTX, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width()); + command_print(CMD_CTX, "adapter_nsrst_assert_width: %u", jtag_get_nsrst_assert_width()); return ERROR_OK; } @@ -1619,10 +1619,17 @@ static const struct command_registration interface_command_handlers[] = { .usage = "[khz]", }, { + .name = "adapter_nsrst_assert_width", + .handler = handle_adapter_nsrst_assert_width_command, + .mode = COMMAND_ANY, + .help = "delay after asserting SRST in ms", + .usage = "[milliseconds]", + }, + { .name = "adapter_nsrst_delay", .handler = handle_adapter_nsrst_delay_command, .mode = COMMAND_ANY, - .help = "delay after deasserting srst in ms", + .help = "delay after deasserting SRST in ms", .usage = "[milliseconds]", }, { @@ -1681,13 +1688,6 @@ static const struct command_registration jtag_command_handlers[] = { .usage = "[milliseconds]", }, { - .name = "jtag_nsrst_assert_width", - .handler = handle_jtag_nsrst_assert_width_command, - .mode = COMMAND_ANY, - .help = "delay after asserting srst in ms", - .usage = "[milliseconds]", - }, - { .name = "jtag_ntrst_assert_width", .handler = handle_jtag_ntrst_assert_width_command, .mode = COMMAND_ANY, |