diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-15 08:41:30 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-15 08:41:30 -0700 |
| commit | b559b273b526b3077b3ca219eecc8df9f86efac0 (patch) | |
| tree | 5848552f09431e065550e60e8106029e01db3136 /src/jtag/core.c | |
| parent | 96f9790279f74f39b35fc3ad09340fd03123180c (diff) | |
| download | openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.gz openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.bz2 openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.tar.xz openocd+libswd-b559b273b526b3077b3ca219eecc8df9f86efac0.zip | |
rename jtag_nsrst_delay as adapter_nsrst_delay
Globally rename "jtag_nsrst_delay" as "adapter_nsrst_delay", and move it
out of the "jtag" command group ... it needs to be used with non-JTAG
transports
Includes a migration aid (in jtag/startup.tcl) so that old user scripts
won't break. That aid should Sunset in about a year.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/jtag/core.c')
| -rw-r--r-- | src/jtag/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index bdf968e9..bb11ff15 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -93,7 +93,7 @@ static bool jtag_verify_capture_ir = true; static int jtag_verify = 1; /* how long the OpenOCD should wait before attempting JTAG communication after reset lines deasserted (in ms) */ -static int jtag_nsrst_delay = 0; /* default to no nSRST delay */ +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 jtag_ntrst_assert_width = 0; /* width of assertion */ @@ -704,8 +704,8 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) } else { LOG_DEBUG("SRST line released"); - if (jtag_nsrst_delay) - jtag_add_sleep(jtag_nsrst_delay * 1000); + if (adapter_nsrst_delay) + jtag_add_sleep(adapter_nsrst_delay * 1000); } } @@ -1696,11 +1696,11 @@ int jtag_get_srst(void) void jtag_set_nsrst_delay(unsigned delay) { - jtag_nsrst_delay = delay; + adapter_nsrst_delay = delay; } unsigned jtag_get_nsrst_delay(void) { - return jtag_nsrst_delay; + return adapter_nsrst_delay; } void jtag_set_ntrst_delay(unsigned delay) { |