bitq: reduce scope of variables

Change-Id: Ie1049b9d8ed5e44aee038e9181e423c35b4263c4
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/208
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index 064f43b01146696f9e274e8d00a22efb7db3c6eb..db16757c85fa4df4f3613fd05e2a3b2e8c6a3f52 100644 (file)
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -43,9 +43,6 @@ static struct bitq_state bitq_in_state;
  */
 void bitq_in_proc(void)
 {
  */
 void bitq_in_proc(void)
 {

-       struct scan_field* field;
-       int           tdo;
-

        /* loop through the queue */
        while (bitq_in_state.cmd)
        {
        /* loop through the queue */
        while (bitq_in_state.cmd)
        {


@@ -55,6 +52,7 @@ void bitq_in_proc(void)
                        /* loop through the fields */
                        while (bitq_in_state.field_idx < bitq_in_state.cmd->cmd.scan->num_fields)
                        {
                        /* 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)
                                {
                                field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx];
                                if (field->in_value)
                                {


@@ -66,7 +64,8 @@ void bitq_in_proc(void)
                                                /* mask of next bit to be scanned */
                                                uint8_t in_mask = 1 << (bitq_in_state.bit_pos % 8);
 
                                                /* mask of next bit to be scanned */
                                                uint8_t in_mask = 1 << (bitq_in_state.bit_pos % 8);
 

-                                               if ((tdo = bitq_interface->in()) < 0)
+                                               int tdo = bitq_interface->in();
+                                               if (tdo < 0)

                                                {
 #ifdef _DEBUG_JTAG_IO_
                                                        LOG_DEBUG("bitq in EOF");
                                                {
 #ifdef _DEBUG_JTAG_IO_
                                                        LOG_DEBUG("bitq in EOF");