[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-383-gf44eeba

[Ø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  f44eeba16f3e9bebfbc78fd0841124d8b2556246 (commit)
       via  bf8d954352465826e84a245bd4ec8c958eb91c21 (commit)
       via  bef497aeb069314cae3a13dd339a181a3ecf67cd (commit)
      from  fe1f7f63b628ae485609500b8710bfea3bac61a6 (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 f44eeba16f3e9bebfbc78fd0841124d8b2556246
Author: Edgar Grimberg <edg...@zy...>
Date:   Mon Jun 21 23:06:15 2010 +0200

    xsvf: Fix shadow issues on Mac
    
    wait is declared in /usr/include/sys/wait.h
    
    Signed-off-by: Edgar Grimberg <edg...@zy...>

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index f4d09ff..157d728 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -760,7 +760,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 				   XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
 				*/
 
-				uint8_t	wait;
+				uint8_t	wait_local;
 				uint8_t	end;
 				uint8_t	delay_buf[4];
 
@@ -768,7 +768,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 				tap_state_t end_state;
 				int	delay;
 
-				if (read(xsvf_fd, &wait, 1) < 0
+				if (read(xsvf_fd, &wait_local, 1) < 0
 				  || read(xsvf_fd, &end, 1) < 0
 				  || read(xsvf_fd, delay_buf, 4) < 0)
 				{
@@ -776,7 +776,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					break;
 				}
 
-				wait_state = xsvf_to_tap(wait);
+				wait_state = xsvf_to_tap(wait_local);
 				end_state  = xsvf_to_tap(end);
 				delay      = be_to_h_u32(delay_buf);
 
@@ -804,14 +804,14 @@ COMMAND_HANDLER(handle_xsvf_command)
 
 				uint8_t  clock_buf[4];
 				uint8_t	usecs_buf[4];
-				uint8_t	wait;
+				uint8_t	wait_local;
 				uint8_t	end;
 				tap_state_t wait_state;
 				tap_state_t end_state;
 				int clock_count;
 				int usecs;
 
-				if (read(xsvf_fd, &wait, 1) < 0
+				if (read(xsvf_fd, &wait_local, 1) < 0
 				 ||  read(xsvf_fd, &end, 1) < 0
 				 ||  read(xsvf_fd, clock_buf, 4) < 0
 				 ||  read(xsvf_fd, usecs_buf, 4) < 0)
@@ -820,7 +820,7 @@ COMMAND_HANDLER(handle_xsvf_command)
 					break;
 				}
 
-				wait_state = xsvf_to_tap(wait);
+				wait_state = xsvf_to_tap(wait_local);
 				end_state  = xsvf_to_tap(end);
 
 				clock_count = be_to_h_u32(clock_buf);

commit bf8d954352465826e84a245bd4ec8c958eb91c21
Author: Edgar Grimberg <edg...@zy...>
Date:   Mon Jun 21 23:04:16 2010 +0200

    target: Fix shadow issues on Mac
    
    wait is declared in /usr/include/sys/wait.h
    
    Signed-off-by: Edgar Grimberg <edg...@zy...>

diff --git a/src/target/target.c b/src/target/target.c
index 9599fec..7513346 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2135,11 +2135,11 @@ COMMAND_HANDLER(handle_halt_command)
 
 	if (CMD_ARGC == 1)
 	{
-		unsigned wait;
-		retval = parse_uint(CMD_ARGV[0], &wait);
+		unsigned wait_local;
+		retval = parse_uint(CMD_ARGV[0], &wait_local);
 		if (ERROR_OK != retval)
 			return ERROR_COMMAND_SYNTAX_ERROR;
-		if (!wait)
+		if (!wait_local)
 			return ERROR_OK;
 	}
 

commit bef497aeb069314cae3a13dd339a181a3ecf67cd
Author: Edgar Grimberg <edg...@zy...>
Date:   Mon Jun 21 23:02:41 2010 +0200

    flash: fix shadow issues on Mac
    
    Wait is declared in /usr/include/sys/wait.h
    
    Signed-off-by: Edgar Grimberg <edg...@zy...>

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 90e9888..4372128 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -209,7 +209,7 @@ static int mg_init_gpio (void)
 	return ret;
 }
 
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
+static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
 {
 	uint8_t status, error;
 	struct target *target = mflash_bank->target;
@@ -228,10 +228,10 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
 
 		if (status & mg_io_rbit_status_busy)
 		{
-			if (wait == mg_io_wait_bsy)
+			if (wait_local == mg_io_wait_bsy)
 				return ERROR_OK;
 		} else {
-			switch (wait)
+			switch (wait_local)
 			{
 				case mg_io_wait_not_bsy:
 					return ERROR_OK;
@@ -259,7 +259,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
 				return ERROR_MG_IO;
 			}
 
-			switch (wait)
+			switch (wait_local)
 			{
 				case mg_io_wait_rdy:
 					if (status & mg_io_rbit_status_ready)

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

Summary of changes:
 src/flash/mflash.c  |    8 ++++----
 src/target/target.c |    6 +++---
 src/xsvf/xsvf.c     |   12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository