This is an automated email from Gerrit.
Jim Paris (j...@jtan.com) just uploaded a new patch set to Gerrit, which you
can find at http://openocd.zylin.com/2366
-- gerrit
commit 7f586ef1901eb7f061974f4693bb34a968982596
Author: Jim Paris <j...@jtan.com>
Date: Wed Oct 29 19:09:49 2014 -0400
nrf51: fix checks for is_erased
is_erased can take the value 0 (no), 1 (yes), or -1 (unknown).
Checks like (!is_erased) don't do the right thing if it's -1.
Change-Id: I10ba32c99494ca803e0a7a1ba56fdd78184b96bb
Signed-off-by: Jim Paris <j...@jtan.com>
diff --git a/src/flash/nor/nrf51.c b/src/flash/nor/nrf51.c
index bfa199a..869bf73 100644
--- a/src/flash/nor/nrf51.c
+++ b/src/flash/nor/nrf51.c
@@ -642,7 +642,7 @@ static int nrf51_write_page(struct flash_bank *bank,
uint32_t offset, const uint
if (sector->is_protected)
goto error;
- if (!sector->is_erased) {
+ if (sector->is_erased == 0) {
res = nrf51_erase_page(bank, chip, sector);
if (res != ERROR_OK) {
LOG_ERROR("Failed to erase sector @ 0x%08"PRIx32,
sector->offset);
@@ -784,7 +784,7 @@ static int nrf51_uicr_flash_write(struct flash_bank *bank,
if (res != ERROR_OK)
return res;
- if (!sector->is_erased) {
+ if (sector->is_erased == 0) {
res = nrf51_erase_page(bank, chip, sector);
if (res != ERROR_OK)
return res;
--
------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
