[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-642-gfa46805

[Spencer O. <nt...@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  fa4680548150b51083239e3a5181a2ecd86a0da9 (commit)
      from  740b9e25b410c164e661d0334a9ea4168406726b (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 fa4680548150b51083239e3a5181a2ecd86a0da9
Author: Spencer Oliver <nt...@us...>
Date:   Wed Dec 8 19:54:10 2010 +0000

    build: fix build from previous commit
    
    commit 740b9e25b410c164e661d0334a9ea4168406726b broke the drivers
    for ftdi and parport due to retval already being defined.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 77b5880..c8a98d2 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -2396,7 +2396,7 @@ static int ft2232_init(void)
 	}
 
 	int jtag_speed_var;
-	int retval = jtag_get_speed(&jtag_speed_var);
+	retval = jtag_get_speed(&jtag_speed_var);
 	if (retval != ERROR_OK)
 		return retval;
 	ft2232_speed(jtag_speed_var);
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index 3402bc2..b61f2f1 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -477,7 +477,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 		}
 
 		parport_toggling_time_ns = ns;
-		int retval = jtag_get_speed(&wait_states);
+		retval = jtag_get_speed(&wait_states);
 		if (retval != ERROR_OK)
 			return retval;
 	}

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

Summary of changes:
 src/jtag/drivers/ft2232.c  |    2 +-
 src/jtag/drivers/parport.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository