Rename the STM50FLW register variable flash_addr used for block write protect handling
All other chips call it wrprotect which is less confusing. As a side
benefit, flash_addr is now a name usable for other stuff.
Corresponding to flashrom svn r496.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/stm50flw0x0x.c b/stm50flw0x0x.c
index a40da76..d2d82d6 100644
--- a/stm50flw0x0x.c
+++ b/stm50flw0x0x.c
@@ -120,7 +120,7 @@
*/
int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset)
{
- volatile uint8_t *flash_addr = flash->virtual_registers + 2;
+ volatile uint8_t *wrprotect = flash->virtual_registers + 2;
const uint8_t unlock_sector = 0x00;
int j;
@@ -142,8 +142,8 @@
// unlock each 4k-sector
for (j = 0; j < 0x10000; j += 0x1000) {
printf_debug("unlocking at 0x%x\n", offset + j);
- chip_writeb(unlock_sector, flash_addr + offset + j);
- if (chip_readb(flash_addr + offset + j) != unlock_sector) {
+ chip_writeb(unlock_sector, wrprotect + offset + j);
+ if (chip_readb(wrprotect + offset + j) != unlock_sector) {
printf("Cannot unlock sector @ 0x%x\n",
offset + j);
return -1;
@@ -151,8 +151,8 @@
}
} else {
printf_debug("unlocking at 0x%x\n", offset);
- chip_writeb(unlock_sector, flash_addr + offset);
- if (chip_readb(flash_addr + offset) != unlock_sector) {
+ chip_writeb(unlock_sector, wrprotect + offset);
+ if (chip_readb(wrprotect + offset) != unlock_sector) {
printf("Cannot unlock sector @ 0x%x\n", offset);
return -1;
}