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>

diff --git a/src/jtag/commands.h b/src/jtag/commands.h
index 87bd9c53706da216dd757c238d20c6f0b2851c83..d591814f54f8d9320c936c83208ca1e3e922c7a4 100644 (file)
--- a/src/jtag/commands.h
+++ b/src/jtag/commands.h
@@ -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,

diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index 121649bcb2cc6ffd369da292cb6417b26b53c190..fca8cfe32551147bf4eab7397db6dc5060e1e273 100644 (file)
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -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

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index e54c8c6146b5af22bb44778ceba986a5e5b9d8c8..9d8b8b12234e9845389db6c54050a02253fda76b 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -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);

diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c
index 6159ef7a59aaa8094ee14961b3058b0b6aa18089..4548cb531ed33683d8155f52c99d53ab77c523a7 100644 (file)
--- a/src/jtag/drivers/bitbang.c
+++ b/src/jtag/drivers/bitbang.c
@@ -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

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index 79ca349ad3f996ed5cef400f69d79c9f052c60bc..a58f6334703f428e02afd906fd7c00afddd24d70 100644 (file)
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -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

diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 99210d26f03db4476fa59f54f788edfc06e81748..1c433a96dfe605f048ff70ab7461d976adc0ad3d 100644 (file)
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -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));

diff --git a/src/jtag/drivers/driver.c b/src/jtag/drivers/driver.c
index 7f7f8791b2452fb3a48b70c9881589402d277815..49f40246e976f70447ee2fb4d72dadf89cdeb766 100644 (file)
--- a/src/jtag/drivers/driver.c
+++ b/src/jtag/drivers/driver.c
@@ -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;

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 93d1c4a809ba07716ab2914d43a58ba51f9a2f3f..2ac410a5d968a056d2b5e23efdafa60a5a1fb13e 100644 (file)
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -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;

diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 0e9f3fe2ba821c544ad6f180d6f55519a3c87bd8..cb29d33aac99e0d864d58b52eeea115ddc5528b8 100644 (file)
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -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

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 21dfab2277ec24be3a543774e31236acd111c109..34fce38880e2ee5011d266ce263e31fafb349672 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -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;

diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index 43f1940207d608df8d59c6ecc9e02b7aa4300e24..0060baff05f7f498d5333267b7dfdf08e22939d0 100644 (file)
--- a/src/jtag/drivers/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -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

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 0d51b27f84a347ec7b4fe945cbe5821471075203..cc7855564968c21d8539a613963153d19a32b5c1 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -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

diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index a9856772956e3fa1ae7b8e99df09c24344c8f4d2..450ce062b00df2fbfacc82d595d1b93507c1a1e7 100644 (file)
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -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));