diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-15 08:42:26 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2010-03-15 08:42:26 -0700 |
| commit | 1bd3ae398646da1107e00e0651abbf9691d2d9ff (patch) | |
| tree | 4ad64cabcc323aa357173dc6202ddbf2dbfd3d81 /src/jtag/core.c | |
| parent | b559b273b526b3077b3ca219eecc8df9f86efac0 (diff) | |
| download | openocd_libswd-1bd3ae398646da1107e00e0651abbf9691d2d9ff.tar.gz openocd_libswd-1bd3ae398646da1107e00e0651abbf9691d2d9ff.tar.bz2 openocd_libswd-1bd3ae398646da1107e00e0651abbf9691d2d9ff.tar.xz openocd_libswd-1bd3ae398646da1107e00e0651abbf9691d2d9ff.zip | |
rename jtag_nsrst_assert_width as adapter_nsrst_assert_width
Globally rename "jtag_nsrst_assert_width" as "adapter_nsrst_assert_width",
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 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) { |