Build Permutations with ftd2xx and libftdi addressed. Also added a new se of regressi...

[openocd.git] / src / jtag / bitq.c

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 6bbfab58eb498ed14fe771d64c40611cd8c547ff..6dc9ec9690e3976c678cc02b81ee600294100602 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-
 bitq_interface_t *bitq_interface; /* low level bit queue interface */
 
 bitq_state_t bitq_in_state; /* state of input queue */
@@ -42,7 +41,6 @@ bitq_state_t bitq_in_state; /* state of input queue */
 u8 *bitq_in_buffer; /* buffer dynamically reallocated as needed */
 unsigned long bitq_in_bufsize=32; /* min. buffer size */
 
-
 /*
  * input queue processing does not use jtag_read_buffer() to avoid unnecessary overhead
  * also the buffer for incomming data is reallocated only if necessary
@@ -129,8 +127,6 @@ void bitq_in_proc(void)
        }
 }
 
-
-
 void bitq_io(int tms, int tdi, int tdo_req)
 {
        bitq_interface->out(tms, tdi, tdo_req);
@@ -138,7 +134,6 @@ void bitq_io(int tms, int tdi, int tdo_req)
        if (bitq_interface->in_rdy()) bitq_in_proc();
 }
 
-
 void bitq_end_state(enum tap_state state)
 {
        if (state==-1) return;
@@ -149,7 +144,6 @@ void bitq_end_state(enum tap_state state)
        end_state = state;
 }
 
-
 void bitq_state_move(enum tap_state new_state)
 {
        int i=0;
@@ -170,7 +164,6 @@ void bitq_state_move(enum tap_state new_state)
        cur_state = new_state;
 }
 
-
 void bitq_path_move(pathmove_command_t *cmd)
 {
        int i;
@@ -179,7 +172,7 @@ void bitq_path_move(pathmove_command_t *cmd)
                if (tap_transitions[cur_state].low == cmd->path[i]) bitq_io(0, 0, 0);
                else if (tap_transitions[cur_state].high == cmd->path[i]) bitq_io(1, 0, 0);
                else {
-                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[i]]);
+                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", jtag_state_name(cur_state), jtag_state_name(cmd->path[i)]);
                        exit(-1);
                }
 
@@ -189,13 +182,12 @@ void bitq_path_move(pathmove_command_t *cmd)
        end_state = cur_state;
 }
 
-
 void bitq_runtest(int num_cycles)
 {
        int i;
 
-       /* only do a state_move when we're not already in RTI */
-       if (cur_state != TAP_RTI) bitq_state_move(TAP_RTI);
+       /* only do a state_move when we're not already in IDLE */
+       if (cur_state != TAP_IDLE) bitq_state_move(TAP_IDLE);
 
        /* execute num_cycles */
        for (i = 0; i < num_cycles; i++)
@@ -205,7 +197,6 @@ void bitq_runtest(int num_cycles)
        if (cur_state != end_state) bitq_state_move(end_state);
 }
 
-
 void bitq_scan_field(scan_field_t *field, int pause)
 {
        int bit_cnt;
@@ -240,25 +231,23 @@ void bitq_scan_field(scan_field_t *field, int pause)
 
        if (pause) {
                bitq_io(0,0,0);
-               if (cur_state==TAP_SI) cur_state=TAP_PI;
-               else if (cur_state==TAP_SD) cur_state=TAP_PD;
+               if (cur_state==TAP_IRSHIFT) cur_state=TAP_IRPAUSE;
+               else if (cur_state==TAP_DRSHIFT) cur_state=TAP_DRPAUSE;
        }
 }
 
-
 void bitq_scan(scan_command_t *cmd)
 {
        int i;
 
-       if (cmd->ir_scan) bitq_state_move(TAP_SI);
-       else bitq_state_move(TAP_SD);
+       if (cmd->ir_scan) bitq_state_move(TAP_IRSHIFT);
+       else bitq_state_move(TAP_DRSHIFT);
 
        for (i=0; i < cmd->num_fields-1; i++)
                bitq_scan_field(&cmd->fields[i], 0);
        bitq_scan_field(&cmd->fields[i], 1);
 }
 
-
 int bitq_execute_queue(void)
 {
        jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
@@ -285,7 +274,7 @@ int bitq_execute_queue(void)
 #endif
                                if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
                                {
-                                       cur_state = TAP_TLR;
+                                       cur_state = TAP_RESET;
                                }
                                bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
                                if (bitq_interface->in_rdy()) bitq_in_proc();
@@ -356,7 +345,6 @@ int bitq_execute_queue(void)
        return bitq_in_state.status;
 }
 
-
 void bitq_cleanup(void)
 {
        if (bitq_in_buffer!=NULL)