Browse Source

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>
tags/v0.5.0-rc1
David Brownell 12 years ago
parent
commit
1bd3ae3986
7 changed files with 21 additions and 18 deletions
  1. +1
    -0
      NEWS
  2. +1
    -1
      doc/openocd.texi
  3. +5
    -5
      src/jtag/core.c
  4. +2
    -0
      src/jtag/startup.tcl
  5. +10
    -10
      src/jtag/tcl.c
  6. +1
    -1
      tcl/board/telo.cfg
  7. +1
    -1
      tcl/target/telo.cfg

+ 1
- 0
NEWS View File

@@ -11,6 +11,7 @@ JTAG Layer:
will not be around forever.
jtag_khz ... is now adapter_khz
jtag_nsrst_delay ... is now adapter_nsrst_delay
jtag_nsrst_assert_width ... is now adapter_nsrst_assert_width

Boundary Scan:



+ 1
- 1
doc/openocd.texi View File

@@ -2643,7 +2643,7 @@ needing to cope with both architecture and board specific constraints.

@section Commands for Handling Resets

@deffn {Command} jtag_nsrst_assert_width milliseconds
@deffn {Command} adapter_nsrst_assert_width milliseconds
Minimum amount of time (in milliseconds) OpenOCD should wait
after asserting nSRST (active-low system reset) before
allowing it to be deasserted.


+ 5
- 5
src/jtag/core.c View File

@@ -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)
{


+ 2
- 0
src/jtag/startup.tcl View File

@@ -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

+ 10
- 10
src/jtag/tcl.c View File

@@ -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;
}

@@ -1618,11 +1618,18 @@ static const struct command_registration interface_command_handlers[] = {
"With or without argument, display current setting.",
.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]",
},
{
@@ -1680,13 +1687,6 @@ static const struct command_registration jtag_command_handlers[] = {
.help = "delay after deasserting trst in ms",
.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,


+ 1
- 1
tcl/board/telo.cfg View File

@@ -13,7 +13,7 @@ source [find target/c100helper.tcl]
# use libftdi.so library instead with this script
# make the reset asserted to
# allow RC circuit to discharge for: [ms]
jtag_nsrst_assert_width 100
adapter_nsrst_assert_width 100
jtag_ntrst_assert_width 100
# don't talk to JTAG after reset for: [ms]
adapter_nsrst_delay 100


+ 1
- 1
tcl/target/telo.cfg View File

@@ -13,7 +13,7 @@ source [find target/c100helper.tcl]
# use libftdi.so library instead with this script
# make the reset asserted to
# allow RC circuit to discharge for: [ms]
jtag_nsrst_assert_width 100
adapter_nsrst_assert_width 100
jtag_ntrst_assert_width 100
# don't talk to JTAG after reset for: [ms]
adapter_nsrst_delay 100


Loading…
Cancel
Save