Author: stefanct Date: Sun Aug 26 23:04:27 2012 New Revision: 1583 URL: http://flashrom.org/trac/flashrom/changeset/1583
Log: Rename AT25F512B-specific code.
The AT25F512B is quite different from the other (older and yet unsupported) chips in the AT25F* familiy, hence rename 512B-specific stuff to make room for the generic AT25F* code.
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at Acked-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
Modified: trunk/at25.c trunk/chipdrivers.h trunk/flashchips.c
Modified: trunk/at25.c ============================================================================== --- trunk/at25.c Sun Aug 26 04:35:13 2012 (r1582) +++ trunk/at25.c Sun Aug 26 23:04:27 2012 (r1583) @@ -86,7 +86,7 @@ return spi_prettyprint_status_register_at25df(flash); }
-int spi_prettyprint_status_register_at25f(struct flashctx *flash) +int spi_prettyprint_status_register_at25f512b(struct flashctx *flash) { uint8_t status;
@@ -202,7 +202,7 @@ return spi_disable_blockprotect_at25df(flash); }
-int spi_disable_blockprotect_at25f(struct flashctx *flash) +int spi_disable_blockprotect_at25f512b(struct flashctx *flash) { /* spi_disable_blockprotect_at25df is not really the right way to do * this, but the side effects of said function work here as well.
Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Aug 26 04:35:13 2012 (r1582) +++ trunk/chipdrivers.h Sun Aug 26 23:04:27 2012 (r1583) @@ -77,13 +77,13 @@ /* at25.c */ int spi_prettyprint_status_register_at25df(struct flashctx *flash); int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash); -int spi_prettyprint_status_register_at25f(struct flashctx *flash); +int spi_prettyprint_status_register_at25f512b(struct flashctx *flash); int spi_prettyprint_status_register_at25fs010(struct flashctx *flash); int spi_prettyprint_status_register_at25fs040(struct flashctx *flash); int spi_prettyprint_status_register_atmel_at26df081a(struct flashctx *flash); int spi_disable_blockprotect_at25df(struct flashctx *flash); int spi_disable_blockprotect_at25df_sec(struct flashctx *flash); -int spi_disable_blockprotect_at25f(struct flashctx *flash); +int spi_disable_blockprotect_at25f512b(struct flashctx *flash); int spi_disable_blockprotect_at25fs010(struct flashctx *flash); int spi_disable_blockprotect_at25fs040(struct flashctx *flash);
Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Aug 26 04:35:13 2012 (r1582) +++ trunk/flashchips.c Sun Aug 26 23:04:27 2012 (r1583) @@ -1697,8 +1697,8 @@ .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_at25f, - .unlock = spi_disable_blockprotect_at25f, + .printlock = spi_prettyprint_status_register_at25f512b, + .unlock = spi_disable_blockprotect_at25f512b, .write = spi_chip_write_256, .read = spi_chip_read, .voltage = {2700, 3600},