]> git.sur5r.net Git - openocd/blobdiff - src/jtag/drivers/bitq.c
transport: fix LOG_DEBUG gaffe
[openocd] / src / jtag / drivers / bitq.c
index d04a39e109c0869236265eaf15ed11b6a727857b..46eb27ae98cdf4c5a3ca77e1aa070a780e0aa67c 100644 (file)
@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include <jtag/jtag.h>
 #include "bitq.h"
 #include <jtag/interface.h>
 
@@ -220,12 +221,12 @@ void bitq_runtest(int num_cycles)
 }
 
 
-void bitq_scan_field(struct scan_field* field, int pause)
+void bitq_scan_field(struct scan_field* field, int do_pause)
 {
        int bit_cnt;
        int tdo_req;
 
-       uint8_t* out_ptr;
+       const uint8_t* out_ptr;
        uint8_t  out_mask;
 
        if (field->in_value)
@@ -239,7 +240,7 @@ void bitq_scan_field(struct scan_field* field, int pause)
                for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--)
                        bitq_io(0, 0, tdo_req);
 
-               bitq_io(pause, 0, tdo_req);
+               bitq_io(do_pause, 0, tdo_req);
        }
        else
        {
@@ -258,10 +259,10 @@ void bitq_scan_field(struct scan_field* field, int pause)
                                out_mask <<= 1;
                }
 
-               bitq_io(pause, ((*out_ptr) & out_mask) != 0, tdo_req);
+               bitq_io(do_pause, ((*out_ptr) & out_mask) != 0, tdo_req);
        }
 
-       if (pause)
+       if (do_pause)
        {
                bitq_io(0, 0, 0);
                if (tap_get_state() == TAP_IRSHIFT)
@@ -322,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