Author: stepan Date: 2007-05-24 10:48:10 +0200 (Thu, 24 May 2007) New Revision: 2691
Modified: trunk/LinuxBIOSv2/util/flashrom/82802ab.c trunk/LinuxBIOSv2/util/flashrom/flash.h trunk/LinuxBIOSv2/util/flashrom/flashrom.c trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c Log: factor out register mapping code (trivial)
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/LinuxBIOSv2/util/flashrom/82802ab.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/82802ab.c 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/82802ab.c 2007-05-24 08:48:10 UTC (rev 2691) @@ -49,7 +49,6 @@ 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 @@
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)
Modified: trunk/LinuxBIOSv2/util/flashrom/flash.h =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/flash.h 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/flash.h 2007-05-24 08:48:10 UTC (rev 2691) @@ -154,4 +154,6 @@
extern int fd_mem;
+int map_flash_registers(struct flashchip *flash); /* flashrom.c */ + #endif /* !__FLASH_H__ */
Modified: trunk/LinuxBIOSv2/util/flashrom/flashrom.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/flashrom.c 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/flashrom.c 2007-05-24 08:48:10 UTC (rev 2691) @@ -99,6 +99,23 @@ return NULL; }
+int map_flash_registers(struct flashchip *flash) +{ + volatile uint8_t *registers; + size_t size = flash->total_size * 1024; + + registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, + fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); + + if (registers == MAP_FAILED) { + perror("Can't mmap registers using " MEM_DEV); + exit(1); + } + flash->virtual_registers = registers; + + return 0; +} + struct flashchip *probe_flash(struct flashchip *flash) { volatile uint8_t *bios;
Modified: trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c 2007-05-24 08:48:10 UTC (rev 2691) @@ -48,7 +48,6 @@ int probe_lhf00l04(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers; uint8_t id1, id2;
#if 0 @@ -75,24 +74,12 @@
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; - // 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); - } + if (id1 != flash->manufacture_id || id2 != flash->model_id) + return 0;
- flash->virtual_registers = registers; - printf("bios %p, *bios 0x%x, bios[1] 0x%x\n", bios, *bios, - bios[1]); - return 1; - } + map_flash_registers(flash);
- return 0; + return 1; }
uint8_t wait_lhf00l04(volatile uint8_t *bios)
Modified: trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c 2007-05-24 08:48:10 UTC (rev 2691) @@ -133,10 +133,8 @@ int probe_49lfxxxc(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers;
uint8_t id1, id2; - size_t size = flash->total_size * 1024;
*bios = RESET;
@@ -147,17 +145,12 @@ *bios = RESET;
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + if (!(id1 == flash->manufacture_id && id2 == flash->model_id)) return 0;
- registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); - if (registers == MAP_FAILED) { - // it's this part but we can't map it ... - perror("Can't mmap memory using " MEM_DEV); - exit(1); - } - flash->virtual_registers = registers; + map_flash_registers(flash); + return 1; }
Modified: trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c 2007-05-23 18:24:58 UTC (rev 2690) +++ trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c 2007-05-24 08:48:10 UTC (rev 2691) @@ -46,21 +46,11 @@ /* probe_jedec works fine for probing */ int probe_sst_fwhub(struct flashchip *flash) { - volatile uint8_t *registers; - size_t size = flash->total_size * 1024; - if (probe_jedec(flash) == 0) return 0;
- registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); - 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; }