Update autotools scripts to require automake 1.6. The configure.in script

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

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 392e3d3da9017e262abc75eb46e97869ff66c288..6d47c48ba4d7dcfaed7f9d50e2b9077c53478698 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -36,10 +36,10 @@
 
 bitq_interface_t* bitq_interface;       /* low level bit queue interface */
 
-bitq_state_t      bitq_in_state;        /* state of input queue */
+static 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 */
+static u8* bitq_in_buffer;                     /* buffer dynamically reallocated as needed */
+static int     bitq_in_bufsize = 32; /* min. buffer size */
 
 /*
  * input queue processing does not use jtag_read_buffer() to avoid unnecessary overhead
@@ -153,7 +153,7 @@ void bitq_io(int tms, int tdi, int tdo_req)
 
 void bitq_end_state(tap_state_t state)
 {
-       if (state==-1)
+       if (state==TAP_INVALID)
                return;
 
        if (!tap_is_state_stable(state))
@@ -194,9 +194,9 @@ void bitq_path_move(pathmove_command_t* cmd)
 
        for (i = 0; i<=cmd->num_states; i++)
        {
-               if (tap_state_transition(tap_get_state(), FALSE) == cmd->path[i])
+               if (tap_state_transition(tap_get_state(), false) == cmd->path[i])
                        bitq_io(0, 0, 0);
-               else if (tap_state_transition(tap_get_state(), TRUE) == cmd->path[i])
+               else if (tap_state_transition(tap_get_state(), true) == cmd->path[i])
                        bitq_io(1, 0, 0);
                else
                {