[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-306-g83ebddd

[Ø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  83ebddd519b2adecd5dace2d268243ad4bd34c9e (commit)
       via  9161b5fc5c4655b5320b16d52f1ab3311d69e97d (commit)
       via  395d3bff8ce59d6c5a34e0a626010343ca9909ba (commit)
      from  00017c90ae82d3237f5a4784caa695459c5897d2 (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 83ebddd519b2adecd5dace2d268243ad4bd34c9e
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Jun 15 23:04:22 2010 +0200

    breakpoint: -Wshadow warning fix
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 637f681..dc44642 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -105,7 +105,7 @@ fail:
 }
 
 /* free up a breakpoint */
-static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_remove)
+static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_to_remove)
 {
 	struct breakpoint *breakpoint = target->breakpoints;
 	struct breakpoint **breakpoint_p = &target->breakpoints;
@@ -113,7 +113,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
 
 	while (breakpoint)
 	{
-		if (breakpoint == breakpoint_remove)
+		if (breakpoint == breakpoint_to_remove)
 			break;
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
@@ -246,7 +246,7 @@ bye:
 	return ERROR_OK;
 }
 
-static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_remove)
+static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
 {
 	struct watchpoint *watchpoint = target->watchpoints;
 	struct watchpoint **watchpoint_p = &target->watchpoints;
@@ -254,7 +254,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 
 	while (watchpoint)
 	{
-		if (watchpoint == watchpoint_remove)
+		if (watchpoint == watchpoint_to_remove)
 			break;
 		watchpoint_p = &watchpoint->next;
 		watchpoint = watchpoint->next;

commit 9161b5fc5c4655b5320b16d52f1ab3311d69e97d
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Jun 15 23:02:46 2010 +0200

    zy1000: -Wshadow warning fix
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 13685f8..b50e96a 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -508,7 +508,7 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
 #endif
 
 // here we shuffle N bits out/in
-static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int num_bits, bool pause, tap_state_t shiftState, tap_state_t end_state)
+static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int num_bits, bool pause_now, tap_state_t shiftState, tap_state_t end_state)
 {
 	tap_state_t pause_state = shiftState;
 	for (int j = 0; j < num_bits; j += 32)
@@ -518,7 +518,7 @@ static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int n
 		{
 			k = 32;
 			/* we have more to shift out */
-		} else if (pause)
+		} else if (pause_now)
 		{
 			/* this was the last to shift out this time */
 			pause_state = end_state;

commit 395d3bff8ce59d6c5a34e0a626010343ca9909ba
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Jun 15 23:01:42 2010 +0200

    fileio: -Wshadow warning fix
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index 71e807f..ba62397 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -98,12 +98,12 @@ static inline int fileio_open_local(struct fileio *fileio)
 	return ERROR_OK;
 }
 
-int fileio_open(struct fileio *fileio, const char *url, enum fileio_access access,	enum fileio_type type)
+int fileio_open(struct fileio *fileio, const char *url, enum fileio_access access_type,	enum fileio_type type)
 {
 	int retval = ERROR_OK;
 
 	fileio->type = type;
-	fileio->access = access;
+	fileio->access = access_type;
 	fileio->url = strdup(url);
 
 	retval = fileio_open_local(fileio);

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

Summary of changes:
 src/helper/fileio.c      |    4 ++--
 src/jtag/zy1000/zy1000.c |    4 ++--
 src/target/breakpoints.c |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository