From b3289c904c0242333d1283e85d88e61ee2d3e923 Mon Sep 17 00:00:00 2001 From: Sean Nelson Date: Tue, 16 Mar 2010 01:00:50 +0000 Subject: Clean up sst28sf040.c after JEDEC refactorings Remove function probe_28sf040. Corresponding to flashrom svn r942. delete references to dead sharplhf00l04.c and sst29sf040.c functions from chipdrivers.h Signed-off-by: Sean Nelson Acked-by: Carl-Daniel Hailfinger --- chipdrivers.h | 3 --- sst28sf040.c | 24 ------------------------ 2 files changed, 27 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index c7fecd2..029c82a 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -93,13 +93,10 @@ int unlock_49fl00x(struct flashchip *flash); int lock_49fl00x(struct flashchip *flash); /* sharplhf00l04.c */ -int probe_lhf00l04(struct flashchip *flash); int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -void protect_lhf00l04(chipaddr bios); /* sst28sf040.c */ -int probe_28sf040(struct flashchip *flash); int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); int write_28sf040(struct flashchip *flash, uint8_t *buf); diff --git a/sst28sf040.c b/sst28sf040.c index bbb9d56..0c90526 100644 --- a/sst28sf040.c +++ b/sst28sf040.c @@ -92,30 +92,6 @@ int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, return 0; } -int probe_28sf040(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; - - chip_writeb(RESET, bios); - programmer_delay(10); - - chip_writeb(READ_ID, bios); - programmer_delay(10); - id1 = chip_readb(bios); - programmer_delay(10); - id2 = chip_readb(bios + 0x01); - - chip_writeb(RESET, bios); - programmer_delay(10); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); - if (id1 == flash->manufacture_id && id2 == flash->model_id) - return 1; - - return 0; -} - int erase_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; -- cgit v1.1