Browse Source

jtag: rename JTAG_MOVESTATE to JTAG_TLR_RESET

JTAG_MOVESTATE is misleading, this cmd is only used
for reset.

JTAG_PATHMOVE should be used otherwise.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
tags/v0.5.0-rc1
Øyvind Harboe 14 years ago
parent
commit
00635e28ba
13 changed files with 21 additions and 14 deletions
  1. +8
    -1
      src/jtag/commands.h
  2. +1
    -1
      src/jtag/drivers/amt_jtagaccel.c
  3. +1
    -1
      src/jtag/drivers/arm-jtag-ew.c
  4. +1
    -1
      src/jtag/drivers/bitbang.c
  5. +1
    -1
      src/jtag/drivers/bitq.c
  6. +1
    -1
      src/jtag/drivers/buspirate.c
  7. +1
    -1
      src/jtag/drivers/driver.c
  8. +1
    -1
      src/jtag/drivers/ft2232.c
  9. +1
    -1
      src/jtag/drivers/gw16012.c
  10. +1
    -1
      src/jtag/drivers/jlink.c
  11. +2
    -2
      src/jtag/drivers/rlink.c
  12. +1
    -1
      src/jtag/drivers/usbprog.c
  13. +1
    -1
      src/jtag/drivers/vsllink.c

+ 8
- 1
src/jtag/commands.h View File

@@ -139,7 +139,14 @@ union jtag_command_container {
*/
enum jtag_command_type {
JTAG_SCAN = 1,
JTAG_STATEMOVE = 2,
/* JTAG_TLR_RESET's non-minidriver implementation is a
* vestige from a statemove cmd. The statemove command
* is obsolete and replaced by pathmove.
*
* pathmove does not support reset as one of it's states,
* hence the need for an explicit statemove command.
*/
JTAG_TLR_RESET = 2,
JTAG_RUNTEST = 3,
JTAG_RESET = 4,
JTAG_PATHMOVE = 6,


+ 1
- 1
src/jtag/drivers/amt_jtagaccel.c View File

@@ -356,7 +356,7 @@ static int amt_jtagaccel_execute_queue(void)
amt_jtagaccel_end_state(cmd->cmd.runtest->end_state);
amt_jtagaccel_runtest(cmd->cmd.runtest->num_cycles);
break;
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
#endif


+ 1
- 1
src/jtag/drivers/arm-jtag-ew.c View File

@@ -117,7 +117,7 @@ static int armjtagew_execute_queue(void)
armjtagew_runtest(cmd->cmd.runtest->num_cycles);
break;

case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);

armjtagew_end_state(cmd->cmd.statemove->end_state);


+ 1
- 1
src/jtag/drivers/bitbang.c View File

@@ -304,7 +304,7 @@ int bitbang_execute_queue(void)
bitbang_stableclocks(cmd->cmd.stableclocks->num_cycles);
break;

case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %s", tap_state_name(cmd->cmd.statemove->end_state));
#endif


+ 1
- 1
src/jtag/drivers/bitq.c View File

@@ -323,7 +323,7 @@ int bitq_execute_queue(void)
bitq_runtest(cmd->cmd.runtest->num_cycles);
break;

case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
#endif


+ 1
- 1
src/jtag/drivers/buspirate.c View File

@@ -146,7 +146,7 @@ static int buspirate_execute_queue(void)
buspirate_runtest(cmd->cmd.runtest
->num_cycles);
break;
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
DEBUG_JTAG_IO("statemove end in %s",
tap_state_name(cmd->cmd.statemove
->end_state));


+ 1
- 1
src/jtag/drivers/driver.c View File

@@ -338,7 +338,7 @@ int interface_jtag_add_tlr(void)

jtag_queue_command(cmd);

cmd->type = JTAG_STATEMOVE;
cmd->type = JTAG_TLR_RESET;

cmd->cmd.statemove = cmd_queue_alloc(sizeof(struct statemove_command));
cmd->cmd.statemove->end_state = state;


+ 1
- 1
src/jtag/drivers/ft2232.c View File

@@ -1978,7 +1978,7 @@ static int ft2232_execute_command(struct jtag_command *cmd)
{
case JTAG_RESET: retval = ft2232_execute_reset(cmd); break;
case JTAG_RUNTEST: retval = ft2232_execute_runtest(cmd); break;
case JTAG_STATEMOVE: retval = ft2232_execute_statemove(cmd); break;
case JTAG_TLR_RESET: retval = ft2232_execute_statemove(cmd); break;
case JTAG_PATHMOVE: retval = ft2232_execute_pathmove(cmd); break;
case JTAG_SCAN: retval = ft2232_execute_scan(cmd); break;
case JTAG_SLEEP: retval = ft2232_execute_sleep(cmd); break;


+ 1
- 1
src/jtag/drivers/gw16012.c View File

@@ -344,7 +344,7 @@ static int gw16012_execute_queue(void)
gw16012_end_state(cmd->cmd.runtest->end_state);
gw16012_runtest(cmd->cmd.runtest->num_cycles);
break;
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
#endif


+ 1
- 1
src/jtag/drivers/jlink.c View File

@@ -202,7 +202,7 @@ static void jlink_execute_command(struct jtag_command *cmd)
switch (cmd->type)
{
case JTAG_RUNTEST: jlink_execute_runtest(cmd); break;
case JTAG_STATEMOVE: jlink_execute_statemove(cmd); break;
case JTAG_TLR_RESET: jlink_execute_statemove(cmd); break;
case JTAG_PATHMOVE: jlink_execute_pathmove(cmd); break;
case JTAG_SCAN: jlink_execute_scan(cmd); break;
case JTAG_RESET: jlink_execute_reset(cmd); break;


+ 2
- 2
src/jtag/drivers/rlink.c View File

@@ -1398,7 +1398,7 @@ int rlink_execute_queue(void)
switch (cmd->type)
{
case JTAG_RUNTEST:
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
case JTAG_PATHMOVE:
case JTAG_SCAN:
break;
@@ -1430,7 +1430,7 @@ int rlink_execute_queue(void)
rlink_end_state(cmd->cmd.runtest->end_state);
rlink_runtest(cmd->cmd.runtest->num_cycles);
break;
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
#endif


+ 1
- 1
src/jtag/drivers/usbprog.c View File

@@ -131,7 +131,7 @@ static int usbprog_execute_queue(void)
usbprog_end_state(cmd->cmd.runtest->end_state);
usbprog_runtest(cmd->cmd.runtest->num_cycles);
break;
case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
#endif


+ 1
- 1
src/jtag/drivers/vsllink.c View File

@@ -165,7 +165,7 @@ static int vsllink_execute_queue(void)
vsllink_runtest(cmd->cmd.runtest->num_cycles);
break;

case JTAG_STATEMOVE:
case JTAG_TLR_RESET:
DEBUG_JTAG_IO("statemove end in %s",
tap_state_name(cmd->cmd.statemove
->end_state));


Loading…
Cancel
Save