diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-16 07:42:41 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-16 07:42:41 +0200 |
| commit | f4958d61ef4188ed02629968d21c3a4de3a89121 (patch) | |
| tree | 7ee26419e4671d4db07a9df273c94baba3d64111 /src | |
| parent | 94f373b404b93a1e1b6c693061f2ed504e4d36aa (diff) | |
| download | openocd+libswd-f4958d61ef4188ed02629968d21c3a4de3a89121.tar.gz openocd+libswd-f4958d61ef4188ed02629968d21c3a4de3a89121.tar.bz2 openocd+libswd-f4958d61ef4188ed02629968d21c3a4de3a89121.tar.xz openocd+libswd-f4958d61ef4188ed02629968d21c3a4de3a89121.zip | |
mflash: -Wshadow warning fix
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/flash/mflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/mflash.c b/src/flash/mflash.c index d3078583..90e9888b 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -209,7 +209,7 @@ static int mg_init_gpio (void) return ret; } -static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) +static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var) { uint8_t status, error; struct target *target = mflash_bank->target; @@ -220,7 +220,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) struct duration bench; duration_start(&bench); - while (time) { + while (time_var) { ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status); if (ret != ERROR_OK) @@ -280,7 +280,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) else LOG_ERROR("mflash: duration measurement failed: %d", ret); - if (t > time) + if (t > time_var) break; } |