From f2756fa240ccf5b2fe888c4abc9c4cdf33932e3a Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Sun, 1 Jun 2014 02:21:02 +0000 Subject: Combine block_erase*_en29lv640b and block_erase*_m29f400bt respectively This patch combines two identical block and chip erase functions respectively: - Merge block_erase_m29f400bt and block_erase_en29lv640b into erase_block_shifted_jedec. - Merge block_erase_chip_m29f400bt and block_erase_chip_en29lv640b into erase_chip_block_shifted_jedec. Leave their implementations in en29lv640b.c for now. Corresponding to flashrom svn r1808. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- en29lv640b.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'en29lv640b.c') diff --git a/en29lv640b.c b/en29lv640b.c index 110aa18..a274f62 100644 --- a/en29lv640b.c +++ b/en29lv640b.c @@ -86,7 +86,7 @@ int probe_en29lv640b(struct flashctx *flash) return 0; } -int erase_en29lv640b(struct flashctx *flash) +static int erase_chip_shifted_jedec(struct flashctx *flash) { chipaddr bios = flash->virtual_memory; @@ -105,8 +105,7 @@ int erase_en29lv640b(struct flashctx *flash) return 0; } -int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, - unsigned int len) +int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len) { chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; @@ -126,12 +125,11 @@ int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, return 0; } -int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int address, - unsigned int blocklen) +int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int address, unsigned int blocklen) { if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) { msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } - return erase_en29lv640b(flash); + return erase_chip_shifted_jedec(flash); } -- cgit v1.1