summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-16 00:05:58 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-16 00:05:58 +0200
commitf9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1 (patch)
tree9b774506b166311338e0710f075fc91149a803fe /src
parentf1ce4fe288dc3a2682b8335177a2800980316ce3 (diff)
downloadopenocd_libswd-f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1.tar.gz
openocd_libswd-f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1.tar.bz2
openocd_libswd-f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1.tar.xz
openocd_libswd-f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1.zip
str9x: -Wshadow warning fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src')
-rw-r--r--src/flash/nor/str9x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index e8e942ee..103af16d 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,
};