[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-451-g51d9b56

[Ø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  51d9b56861e1a64629177283fe37f289de932ba5 (commit)
      from  450aaad1e92ad039ef6a34c11e752a0a315c5397 (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 51d9b56861e1a64629177283fe37f289de932ba5
Author: Michal Demin <mic...@gm...>
Date:   Sat Jul 10 10:08:18 2010 +0200

    Buspirate: fix shadow

diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 1c433a9..e5f8fb6 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -633,24 +633,24 @@ static void buspirate_tap_make_space(int scans, int bits)
 
 static void buspirate_tap_append(int tms, int tdi)
 {
-	int index;
+	int chain_index;
 
 	buspirate_tap_make_space(0, 1);
-	index = tap_chain_index / 8;
+	chain_index = tap_chain_index / 8;
 
-	if (index < BUSPIRATE_BUFFER_SIZE) {
+	if (chain_index < BUSPIRATE_BUFFER_SIZE) {
 		int bit_index = tap_chain_index % 8;
 		uint8_t bit = 1 << bit_index;
 
 		if (tms)
-			tms_chain[index] |= bit;
+			tms_chain[chain_index] |= bit;
 		else
-			tms_chain[index] &= ~bit;
+			tms_chain[chain_index] &= ~bit;
 
 		if (tdi)
-			tdi_chain[index] |= bit;
+			tdi_chain[chain_index] |= bit;
 		else
-			tdi_chain[index] &= ~bit;
+			tdi_chain[chain_index] &= ~bit;
 
 		tap_chain_index++;
 	} else
@@ -832,13 +832,13 @@ static void buspirate_jtag_get_adcs(int fd)
 		((float)c)/155.1515, ((float)d)/155.1515);
 }
 
-static unsigned char buspirate_jtag_command(int buspirate_fd,
+static unsigned char buspirate_jtag_command(int fd,
 		char *cmd, int cmdlen)
 {
 	int res;
 	int len = 0;
 
-	res = buspirate_serial_write(buspirate_fd, cmd, cmdlen);
+	res = buspirate_serial_write(fd, cmd, cmdlen);
 
 	if ((cmd[0] == CMD_UART_SPEED)
 				|| (cmd[0] == CMD_PORT_MODE)
@@ -857,7 +857,7 @@ static unsigned char buspirate_jtag_command(int buspirate_fd,
 		default:
 			LOG_INFO("Wrong !");
 		}
-		res =  buspirate_serial_read(buspirate_fd, cmd, len);
+		res =  buspirate_serial_read(fd, cmd, len);
 		if (res > 0)
 			return (unsigned char)cmd[1];
 		else
@@ -874,8 +874,8 @@ static int buspirate_serial_setspeed(int fd, speed_t speed)
 	struct termios t_opt;
 
 	/* set the serial port parameters */
-	fcntl(buspirate_fd, F_SETFL, 0);
-	tcgetattr(buspirate_fd, &t_opt);
+	fcntl(fd, F_SETFL, 0);
+	tcgetattr(fd, &t_opt);
 	cfsetispeed(&t_opt, speed);
 	cfsetospeed(&t_opt, speed);
 	t_opt.c_cflag |= (CLOCAL | CREAD);
@@ -888,8 +888,8 @@ static int buspirate_serial_setspeed(int fd, speed_t speed)
 	t_opt.c_oflag &= ~OPOST;
 	t_opt.c_cc[VMIN] = 0;
 	t_opt.c_cc[VTIME] = 10;
-	tcflush(buspirate_fd, TCIFLUSH);
-	tcsetattr(buspirate_fd, TCSANOW, &t_opt);
+	tcflush(fd, TCIFLUSH);
+	tcsetattr(fd, TCSANOW, &t_opt);
 
 	return 0;
 }

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

Summary of changes:
 src/jtag/drivers/buspirate.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository