[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-495-g6f84198

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  6f841988417bdf64490604bee4f3c6d26a93a80b (commit)
      from  5c98e063b9827ec96194375f383a54cdff31883f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f841988417bdf64490604bee4f3c6d26a93a80b
Author: David Brownell <dbr...@us...>
Date:   Fri Aug 27 15:16:39 2010 -0700

    bitq: unshadow pause()
    
    bitq.c: In function ‘bitq_scan_field’:
    bitq.c:224: error: declaration of ‘pause’ shadows a global declaration
    /usr/include/unistd.h:429: error: shadowed declaration is here
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index a58f633..46eb27a 100644
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -221,7 +221,7 @@ void bitq_runtest(int num_cycles)
 }
 
 
-void bitq_scan_field(struct scan_field* field, int pause)
+void bitq_scan_field(struct scan_field* field, int do_pause)
 {
 	int bit_cnt;
 	int tdo_req;
@@ -240,7 +240,7 @@ void bitq_scan_field(struct scan_field* field, int pause)
 		for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--)
 			bitq_io(0, 0, tdo_req);
 
-		bitq_io(pause, 0, tdo_req);
+		bitq_io(do_pause, 0, tdo_req);
 	}
 	else
 	{
@@ -259,10 +259,10 @@ void bitq_scan_field(struct scan_field* field, int pause)
 				out_mask <<= 1;
 		}
 
-		bitq_io(pause, ((*out_ptr) & out_mask) != 0, tdo_req);
+		bitq_io(do_pause, ((*out_ptr) & out_mask) != 0, tdo_req);
 	}
 
-	if (pause)
+	if (do_pause)
 	{
 		bitq_io(0, 0, 0);
 		if (tap_get_state() == TAP_IRSHIFT)

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/bitq.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository