jlink: fix -Wshadow warning

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

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index 74555d2bc497d2c1486c104784c37f91571289b9..a58f6334703f428e02afd906fd7c00afddd24d70 100644 (file)
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -21,8 +21,9 @@
 #include "config.h"
 #endif
 
+#include <jtag/jtag.h>
 #include "bitq.h"
-#include "interface.h"
+#include <jtag/interface.h>
 
 
 struct bitq_interface* bitq_interface;       /* low level bit queue interface */
@@ -225,7 +226,7 @@ void bitq_scan_field(struct scan_field* field, int pause)
        int bit_cnt;
        int tdo_req;
 
-       uint8_t* out_ptr;
+       const uint8_t* out_ptr;
        uint8_t  out_mask;
 
        if (field->in_value)
@@ -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