commit ce532975cbe35d88f767c6305d272c8b6f16ccf7
author Stefan Reinauer <stepan@coresystems.de> Wed May 23 17:20:56 2007 +0000
committer Stefan Reinauer <stefan.reinauer@coreboot.org> Wed May 23 17:20:56 2007 +0000
tree f42ab029b4335a7d9e396bf85e0fc9f0f3d36aa1
parent bc1f1a01e4505bd1a2de45b7a23038a53a184c0d

Big cosmetic offensive on flashrom

* Give decent names to virt_addr and virt_addr_2
* add some comments
* move virtual addresses to the end of the struct,
  so they dont mess up the initializer.

Corresponding to flashrom svn r111 and coreboot v2 svn r2689.

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

flashrom.c

diff --git a/flashrom.c b/flashrom.c
index cf895a0..cd97dda 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -139,7 +139,7 @@
 			perror("Error: Can't mmap " MEM_DEV ".");
 			exit(1);
 		}
-		flash->virt_addr = bios;
+		flash->virtual_memory = bios;
 
 		if (flash->probe(flash) == 1) {
 			printf("%s found at physical address: 0x%lx\n",
@@ -157,7 +157,7 @@
 {
 	int idx;
 	int total_size = flash->total_size * 1024;
-	volatile uint8_t *bios = flash->virt_addr;
+	volatile uint8_t *bios = flash->virtual_memory;
 
 	printf("Verifying flash ");
 
@@ -388,7 +388,7 @@
 		}
 		printf("Reading Flash...");
 		if (flash->read == NULL)
-			memcpy(buf, (const char *)flash->virt_addr, size);
+			memcpy(buf, (const char *)flash->virtual_memory, size);
 		else
 			flash->read(flash, buf);
 
@@ -430,7 +430,7 @@
 	// ////////////////////////////////////////////////////////////
 	if (exclude_end_position - exclude_start_position > 0)
 		memcpy(buf + exclude_start_position,
-		       (const char *)flash->virt_addr + exclude_start_position,
+		       (const char *)flash->virtual_memory + exclude_start_position,
 		       exclude_end_position - exclude_start_position);
 
 	exclude_start_page = exclude_start_position / flash->page_size;
@@ -442,7 +442,7 @@
 
 	// This should be moved into each flash part's code to do it 
 	// cleanly. This does the job.
-	handle_romentries(buf, (uint8_t *) flash->virt_addr);
+	handle_romentries(buf, (uint8_t *) flash->virtual_memory);
 
 	// ////////////////////////////////////////////////////////////