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>
This commit is contained in:
Øyvind Harboe 2010-06-05 11:30:49 +02:00
parent a1cf1b5244
commit 00635e28ba
13 changed files with 21 additions and 14 deletions

View File

@ -139,7 +139,14 @@ union jtag_command_container {
*/ */
enum jtag_command_type { enum jtag_command_type {
JTAG_SCAN = 1, 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_RUNTEST = 3,
JTAG_RESET = 4, JTAG_RESET = 4,
JTAG_PATHMOVE = 6, JTAG_PATHMOVE = 6,

View File

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

View File

@ -117,7 +117,7 @@ static int armjtagew_execute_queue(void)
armjtagew_runtest(cmd->cmd.runtest->num_cycles); armjtagew_runtest(cmd->cmd.runtest->num_cycles);
break; break;
case JTAG_STATEMOVE: case JTAG_TLR_RESET:
DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state); DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
armjtagew_end_state(cmd->cmd.statemove->end_state); armjtagew_end_state(cmd->cmd.statemove->end_state);

View File

@ -304,7 +304,7 @@ int bitbang_execute_queue(void)
bitbang_stableclocks(cmd->cmd.stableclocks->num_cycles); bitbang_stableclocks(cmd->cmd.stableclocks->num_cycles);
break; break;
case JTAG_STATEMOVE: case JTAG_TLR_RESET:
#ifdef _DEBUG_JTAG_IO_ #ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("statemove end in %s", tap_state_name(cmd->cmd.statemove->end_state)); LOG_DEBUG("statemove end in %s", tap_state_name(cmd->cmd.statemove->end_state));
#endif #endif

View File

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

View File

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

View File

@ -338,7 +338,7 @@ int interface_jtag_add_tlr(void)
jtag_queue_command(cmd); 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 = cmd_queue_alloc(sizeof(struct statemove_command));
cmd->cmd.statemove->end_state = state; cmd->cmd.statemove->end_state = state;

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_RESET: retval = ft2232_execute_reset(cmd); break;
case JTAG_RUNTEST: retval = ft2232_execute_runtest(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_PATHMOVE: retval = ft2232_execute_pathmove(cmd); break;
case JTAG_SCAN: retval = ft2232_execute_scan(cmd); break; case JTAG_SCAN: retval = ft2232_execute_scan(cmd); break;
case JTAG_SLEEP: retval = ft2232_execute_sleep(cmd); break; case JTAG_SLEEP: retval = ft2232_execute_sleep(cmd); break;

View File

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

View File

@ -202,7 +202,7 @@ static void jlink_execute_command(struct jtag_command *cmd)
switch (cmd->type) switch (cmd->type)
{ {
case JTAG_RUNTEST: jlink_execute_runtest(cmd); break; 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_PATHMOVE: jlink_execute_pathmove(cmd); break;
case JTAG_SCAN: jlink_execute_scan(cmd); break; case JTAG_SCAN: jlink_execute_scan(cmd); break;
case JTAG_RESET: jlink_execute_reset(cmd); break; case JTAG_RESET: jlink_execute_reset(cmd); break;

View File

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

View File

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

View File

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