projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixes '[<>]' whitespace
[fw/openocd]
/
src
/
flash
/
ocl
/
at91sam7x
/
samflash.c
diff --git
a/src/flash/ocl/at91sam7x/samflash.c
b/src/flash/ocl/at91sam7x/samflash.c
index 6f7bf5f55f005a33d03436862183953e5b6360e5..bcb6dd09979949d3a0e415ef4ce352925fa4fb70 100644
(file)
--- a/
src/flash/ocl/at91sam7x/samflash.c
+++ b/
src/flash/ocl/at91sam7x/samflash.c
@@
-146,7
+146,7
@@
int flash_erase_plane(int efc_ofs)
if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
}
if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE;
}
- if ((page_num += flash_lock_pages)
>
flash_page_count) break;
+ if ((page_num += flash_lock_pages)
>
flash_page_count) break;
lockbits>>=1;
}
lockbits>>=1;
}
@@
-178,7
+178,7
@@
int flash_erase_all(void)
if ((result = flash_erase_plane(0)) != FLASH_STAT_OK) return result;
/* the second flash controller, if any */
if ((result = flash_erase_plane(0)) != FLASH_STAT_OK) return result;
/* the second flash controller, if any */
- if (flash_page_count
>
1024) result = flash_erase_plane(0x10);
+ if (flash_page_count
>
1024) result = flash_erase_plane(0x10);
return result;
}
return result;
}