[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-346-gf2f798f

[Øyvind H. <go...@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  f2f798fdd3a4c6d221569ba278945385c2f47504 (commit)
       via  d4e4da0fa177c640196e5bc3476ed03c3a70be00 (commit)
      from  8a2808681e932b6644f572717885c8f8f360e9fa (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 f2f798fdd3a4c6d221569ba278945385c2f47504
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Jun 17 23:13:08 2010 +0800

    jlink: fix -Wshadow warning
    
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 34fce38..52f12b4 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -712,9 +712,9 @@ static void jlink_tap_ensure_space(int scans, int bits)
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
-	int index = tap_length / 8;
+	int index_var = tap_length / 8;
 
-	if (index >= JLINK_TAP_BUFFER_SIZE)
+	if (index_var >= JLINK_TAP_BUFFER_SIZE)
 	{
 		LOG_ERROR("jlink_tap_append_step: overflow");
 		*(uint32_t *)0xFFFFFFFF = 0;
@@ -727,18 +727,18 @@ static void jlink_tap_append_step(int tms, int tdi)
 	// we do not pad TMS, so be sure to initialize all bits
 	if (0 == bit_index)
 	{
-		tms_buffer[index] = tdi_buffer[index] = 0;
+		tms_buffer[index_var] = tdi_buffer[index_var] = 0;
 	}
 
 	if (tms)
-		tms_buffer[index] |= bit;
+		tms_buffer[index_var] |= bit;
 	else
-		tms_buffer[index] &= ~bit;
+		tms_buffer[index_var] &= ~bit;
 
 	if (tdi)
-		tdi_buffer[index] |= bit;
+		tdi_buffer[index_var] |= bit;
 	else
-		tdi_buffer[index] &= ~bit;
+		tdi_buffer[index_var] &= ~bit;
 
 	tap_length++;
 }

commit d4e4da0fa177c640196e5bc3476ed03c3a70be00
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Jun 17 23:12:48 2010 +0800

    vsllink: fix -Wshadow warning
    
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index 450ce06..7533a09 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -699,20 +699,20 @@ static void vsllink_tap_ensure_pending(int scans)
 
 static void vsllink_tap_append_step(int tms, int tdi)
 {
-	int index = tap_length / 8;
+	int index_var = tap_length / 8;
 
 	int bit_index = tap_length % 8;
 	uint8_t bit = 1 << bit_index;
 
 	if (tms)
-		tms_buffer[index] |= bit;
+		tms_buffer[index_var] |= bit;
 	else
-		tms_buffer[index] &= ~bit;
+		tms_buffer[index_var] &= ~bit;
 
 	if (tdi)
-		tdi_buffer[index] |= bit;
+		tdi_buffer[index_var] |= bit;
 	else
-		tdi_buffer[index] &= ~bit;
+		tdi_buffer[index_var] &= ~bit;
 
 	tap_length++;
 

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

Summary of changes:
 src/jtag/drivers/jlink.c   |   14 +++++++-------
 src/jtag/drivers/vsllink.c |   10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository