[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-332-g72d227c

[Ø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  72d227cd5e32a6b141026e31ca4702cd69c79e62 (commit)
       via  42c84c59b1a733c27e164920cca58716cd7e8740 (commit)
       via  f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1 (commit)
      from  f1ce4fe288dc3a2682b8335177a2800980316ce3 (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 72d227cd5e32a6b141026e31ca4702cd69c79e62
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed Jun 16 00:08:58 2010 +0200

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

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 343c43e..2f02e5d 100644
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -1215,7 +1215,7 @@ static int tms470_protect_check(struct flash_bank *bank)
 
 /* ---------------------------------------------------------------------- */
 
-static int tms470_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_tms470_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	int used = 0;
 	struct tms470_flash_bank *tms470_info = bank->driver_priv;
@@ -1275,5 +1275,5 @@ struct flash_driver tms470_flash = {
 	.auto_probe = tms470_auto_probe,
 	.erase_check = tms470_erase_check,
 	.protect_check = tms470_protect_check,
-	.info = tms470_info,
+	.info = get_tms470_info,
 };

commit 42c84c59b1a733c27e164920cca58716cd7e8740
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed Jun 16 00:07:59 2010 +0200

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

diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index 073dfe1..f8b705e 100644
--- a/src/flash/nor/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
@@ -665,7 +665,7 @@ static int str9xpec_write(struct flash_bank *bank, uint8_t *buffer,
 	if (bytes_remaining)
 	{
 		uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-		int i = 0;
+		i = 0;
 
 		while (bytes_remaining > 0)
 		{
@@ -762,7 +762,7 @@ static int str9xpec_erase_check(struct flash_bank *bank)
 	return str9xpec_blank_check(bank, 0, bank->num_sectors - 1);
 }
 
-static int str9xpec_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str9xpec_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	snprintf(buf, buf_size, "str9xpec flash driver info");
 	return ERROR_OK;
@@ -1252,5 +1252,5 @@ struct flash_driver str9xpec_flash = {
 	.auto_probe = str9xpec_probe,
 	.erase_check = str9xpec_erase_check,
 	.protect_check = str9xpec_protect_check,
-	.info = str9xpec_info,
+	.info = get_str9xpec_info,
 };

commit f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed Jun 16 00:05:58 2010 +0200

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

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index e8e942e..103af16 100644
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -564,7 +564,7 @@ static int str9x_write(struct flash_bank *bank,
 	if (bytes_remaining)
 	{
 		uint8_t last_halfword[2] = {0xff, 0xff};
-		int i = 0;
+		i = 0;
 
 		while (bytes_remaining > 0)
 		{
@@ -621,7 +621,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	snprintf(buf, buf_size, "str9x flash driver info");
 	return ERROR_OK;
@@ -706,5 +706,5 @@ struct flash_driver str9x_flash = {
 	.auto_probe = str9x_probe,
 	.erase_check = default_flash_blank_check,
 	.protect_check = str9x_protect_check,
-	.info = str9x_info,
+	.info = get_str9x_info,
 };

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

Summary of changes:
 src/flash/nor/str9x.c    |    6 +++---
 src/flash/nor/str9xpec.c |    6 +++---
 src/flash/nor/tms470.c   |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository