diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-11-03 21:39:23 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-07 20:32:51 +0000 |
| commit | 00c864835149a96b431fc8f31dd89542d88fd383 (patch) | |
| tree | 04be1f6291f41181eb085909730300848002bc5f | |
| parent | 4bea65f1b23d81521716af38007139a8cd06b3b4 (diff) | |
at91sam3: fix warnings
- reduce scope of variables
- assert on post condition to fix clang warning
Change-Id: Id91038f73a632f9688ba52c9c34eae923626e770
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/160
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
| -rw-r--r-- | src/flash/nor/at91sam3.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c index c46829ef..43db51d8 100644 --- a/src/flash/nor/at91sam3.c +++ b/src/flash/nor/at91sam3.c @@ -2926,6 +2926,10 @@ sam3_write(struct flash_bank *bank, page_cur++; } + /* By checking that offset is correct here, we also + fix a clang warning */ + assert(offset == pPrivate->page_size); + // intermediate large pages // also - the final *terminal* // if that terminal page is a full page @@ -2972,14 +2976,13 @@ sam3_write(struct flash_bank *bank, COMMAND_HANDLER(sam3_handle_info_command) { struct sam3_chip *pChip; - unsigned x; - int r; - pChip = get_current_sam3(CMD_CTX); if (!pChip) { return ERROR_OK; } + unsigned x; + int r; r = 0; // bank0 must exist before we can do anything |