Fix compilation of target_request.h when it is included first.

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

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index 392e3d3da9017e262abc75eb46e97869ff66c288..af17b63892a0bdb7869229672572288e4854a2ca 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -23,23 +23,13 @@
 
 #include "bitq.h"
 
-/* project specific includes */
-#include "log.h"
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
-
-/* system includes */
-#include <string.h>
-#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 */
+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
@@ -66,7 +56,7 @@ void bitq_in_proc(void)
                        while (bitq_in_state.field_idx<bitq_in_state.cmd->cmd.scan->num_fields)
                        {
                                field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx];
-                               if (field->in_value || field->in_handler)
+                               if (field->in_value)
                                {
                                        if (bitq_in_state.bit_pos==0)
                                        {
@@ -124,12 +114,6 @@ void bitq_in_proc(void)
                                                        in_mask <<= 1;
                                                bitq_in_state.bit_pos++;
                                        }
-
-
-                                       if (field->in_handler && bitq_in_state.status==ERROR_OK)
-                                       {
-                                               bitq_in_state.status = (*field->in_handler)(in_buff, field->in_handler_priv, field);
-                                       }
                                }
 
                                bitq_in_state.field_idx++;  /* advance to next field */
@@ -153,7 +137,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 +178,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
                {
@@ -238,7 +222,7 @@ void bitq_scan_field(scan_field_t* field, int pause)
        u8* out_ptr;
        u8  out_mask;
 
-       if (field->in_value || field->in_handler)
+       if (field->in_value)
                tdo_req = 1;
        else
                tdo_req = 0;