bitq: reduce scope of variables

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

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index 4e2dbc21c3fb21ca5f60801890b003aba9470d41..db16757c85fa4df4f3613fd05e2a3b2e8c6a3f52 100644 (file)
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -32,7 +32,7 @@ struct bitq_interface* bitq_interface;       /* low level bit queue interface */
 struct bitq_state {
        struct jtag_command *cmd; /* command currently processed */
        int field_idx; /* index of field currently being processed */
-       int bit_pos; /* position of bit curently being processed */
+       int bit_pos; /* position of bit currently being processed */
        int status; /* processing status */
 };
 static struct bitq_state bitq_in_state;
@@ -43,14 +43,6 @@ static struct bitq_state bitq_in_state;
  */
 void bitq_in_proc(void)
 {
-       /* static information preserved between calls to increase performance */
-       static uint8_t*    in_buff;  /* pointer to buffer for scanned data */
-       static int    in_idx;   /* index of byte being scanned */
-       static uint8_t     in_mask;  /* mask of next bit to be scanned */
-
-       struct scan_field* field;
-       int           tdo;
-
        /* loop through the queue */
        while (bitq_in_state.cmd)
        {
@@ -60,21 +52,20 @@ void bitq_in_proc(void)
                        /* loop through the fields */
                        while (bitq_in_state.field_idx < bitq_in_state.cmd->cmd.scan->num_fields)
                        {
+                               struct scan_field *field;
                                field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx];
                                if (field->in_value)
                                {
-                                       if (bitq_in_state.bit_pos == 0)
-                                       {
-                                               /* initialize field scanning */
-                                               in_mask = 0x01;
-                                               in_idx  = 0;
-                                               in_buff = field->in_value;
-                                       }
-
                                        /* field scanning */
                                        while (bitq_in_state.bit_pos < field->num_bits)
                                        {
-                                               if ((tdo = bitq_interface->in()) < 0)
+                                               /* index of byte being scanned */
+                                               int in_idx = bitq_in_state.bit_pos / 8;
+                                               /* mask of next bit to be scanned */
+                                               uint8_t in_mask = 1 << (bitq_in_state.bit_pos % 8);
+
+                                               int tdo = bitq_interface->in();
+                                               if (tdo < 0)
                                                {
 #ifdef _DEBUG_JTAG_IO_
                                                        LOG_DEBUG("bitq in EOF");
@@ -82,16 +73,9 @@ void bitq_in_proc(void)
                                                        return;
                                                }
                                                if (in_mask == 0x01)
-                                                       in_buff[in_idx] = 0;
+                                                       field->in_value[in_idx] = 0;
                                                if (tdo)
-                                                       in_buff[in_idx] |= in_mask;
-                                               if (in_mask == 0x80)
-                                               {
-                                                       in_mask = 0x01;
-                                                       in_idx++;
-                                               }
-                                               else
-                                                       in_mask <<= 1;
+                                                       field->in_value[in_idx] |= in_mask;
                                                bitq_in_state.bit_pos++;
                                        }
                                }