From ff4f197a24d2b06162e062004874ac915ee353ac Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 24 May 2007 08:48:10 +0000 Subject: Factor out register mapping code Corresponding to flashrom svn r113 and coreboot v2 svn r2691. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer --- 82802ab.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to '82802ab.c') diff --git a/82802ab.c b/82802ab.c index 199cf4d..2dacfa3 100644 --- a/82802ab.c +++ b/82802ab.c @@ -49,7 +49,6 @@ void print_82802ab_status(uint8_t status) int probe_82802ab(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers; uint8_t id1, id2; #if 0 @@ -75,23 +74,12 @@ int probe_82802ab(struct flashchip *flash) printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - if (id1 == flash->manufacture_id && id2 == flash->model_id) { - size_t size = flash->total_size * 1024; + if (id1 != flash->manufacture_id || id2 != flash->model_id) + return 0; - // we need to mmap the write-protect space. - registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t) (0 - 0x400000 - size)); - if (registers == MAP_FAILED) { - // it's this part but we can't map it ... - perror("Can't mmap memory using " MEM_DEV); - exit(1); - } + map_flash_registers(flash); - flash->virtual_registers = registers; - return 1; - } - - return 0; + return 1; } uint8_t wait_82802ab(volatile uint8_t *bios) -- cgit v1.1