summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-16 00:07:59 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-16 00:07:59 +0200
commit42c84c59b1a733c27e164920cca58716cd7e8740 (patch)
treeed35fd7a74659c8d2d2adaa6cb9e13a51c457180 /src/flash
parentf9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1 (diff)
downloadopenocd_libswd-42c84c59b1a733c27e164920cca58716cd7e8740.tar.gz
openocd_libswd-42c84c59b1a733c27e164920cca58716cd7e8740.tar.bz2
openocd_libswd-42c84c59b1a733c27e164920cca58716cd7e8740.tar.xz
openocd_libswd-42c84c59b1a733c27e164920cca58716cd7e8740.zip
str9xpec: -Wshadow warning fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nor/str9xpec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index 073dfe10..f8b705e0 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,
};