factor out register mapping code (trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2691 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 32 insertions, 55 deletions

diff --git a/util/flashrom/82802ab.c b/util/flashrom/82802ab.c
index 199cf4d7ef..2dacfa30a1 100644
--- a/util/flashrom/82802ab.c
+++ b/util/flashrom/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)
diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h
index ad9f61a35f..51ce38baca 100644
--- a/util/flashrom/flash.h
+++ b/util/flashrom/flash.h
@@ -154,4 +154,6 @@ int chipset_flash_enable(void);	/* chipset_enable.c */
 
 extern int fd_mem;
 
+int map_flash_registers(struct flashchip *flash); /* flashrom.c */
+
 #endif				/* !__FLASH_H__ */
diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c
index a05def76b3..8ada918a68 100644
--- a/util/flashrom/flashrom.c
+++ b/util/flashrom/flashrom.c
@@ -99,6 +99,23 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
 	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;
diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c
index a4d086e1ea..1caedd0b67 100644
--- a/util/flashrom/sharplhf00l04.c
+++ b/util/flashrom/sharplhf00l04.c
@@ -48,7 +48,6 @@ void print_lhf00l04_status(uint8_t status)
 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 @@ int probe_lhf00l04(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;
-		// 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);
-		}
-
-		flash->virtual_registers = registers;
-		printf("bios %p, *bios 0x%x, bios[1] 0x%x\n", bios, *bios,
-		       bios[1]);
-		return 1;
-	}
+	if (id1 != flash->manufacture_id || id2 != flash->model_id) 
+		return 0;
+
+	map_flash_registers(flash);
 
-	return 0;
+	return 1;
 }
 
 uint8_t wait_lhf00l04(volatile uint8_t *bios)
diff --git a/util/flashrom/sst49lfxxxc.c b/util/flashrom/sst49lfxxxc.c
index b8f4b844e3..16f84df4a1 100644
--- a/util/flashrom/sst49lfxxxc.c
+++ b/util/flashrom/sst49lfxxxc.c
@@ -133,10 +133,8 @@ static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios,
 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 @@ int probe_49lfxxxc(struct flashchip *flash)
 	*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;
 }
 
diff --git a/util/flashrom/sst_fwhub.c b/util/flashrom/sst_fwhub.c
index 78589b1457..b828ceef3b 100644
--- a/util/flashrom/sst_fwhub.c
+++ b/util/flashrom/sst_fwhub.c
@@ -46,21 +46,11 @@ void print_sst_fwhub_status(uint8_t status)
 /* 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;
 }