]> git.sur5r.net Git - openocd/commitdiff
str9xpec: -Wshadow warning fixes
authorØyvind Harboe <oyvind.harboe@zylin.com>
Tue, 15 Jun 2010 22:07:59 +0000 (00:07 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Tue, 15 Jun 2010 22:07:59 +0000 (00:07 +0200)
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/flash/nor/str9xpec.c

index 073dfe10fa31750abf3d7e1ef1e3157a7672791b..f8b705e080c6c5aa057102e2cb9107a953be106b 100644 (file)
@@ -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,
 };