aboutsummaryrefslogtreecommitdiff
path: root/util/flashrom/flashrom.c
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2007-05-23 17:20:56 +0000
committerStefan Reinauer <stepan@openbios.org>2007-05-23 17:20:56 +0000
commitf8eea5cd1c641495bdc635e61575597a82629ef8 (patch)
tree3fd8eed9b6033f4fc7b38ec2a42b031c6bcbd340 /util/flashrom/flashrom.c
parentf2d1428120a9fee473b38492c6cf062ca8341e93 (diff)
big cosmetic offensive on flashrom. (trivial)
* 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. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2689 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/flashrom.c')
-rw-r--r--util/flashrom/flashrom.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c
index cf895a0a59..cd97dda0f1 100644
--- a/util/flashrom/flashrom.c
+++ b/util/flashrom/flashrom.c
@@ -139,7 +139,7 @@ struct flashchip *probe_flash(struct flashchip *flash)
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 verify_flash(struct flashchip *flash, uint8_t *buf)
{
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 @@ int main(int argc, char *argv[])
}
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 @@ int main(int argc, char *argv[])
// ////////////////////////////////////////////////////////////
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 @@ int main(int argc, char *argv[])
// 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);
// ////////////////////////////////////////////////////////////