openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Probe_flash() cleanup for better code readability

Browse Source 
Corresponding to flashrom svn r291 and coreboot v2 svn r3407.

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
This commit is contained in:
Peter Stuge 2008-07-02 17:15:47 +00:00
parent 4c390c8943
commit 27c3e2dc23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flashrom.c
View File

@ -102,18 +102,15 @@ int map_flash_registers(struct flashchip *flash)
struct flashchip *probe_flash(struct flashchip *flash, int force)
{
volatile uint8_t *bios;
unsigned long flash_baseaddr, size;
unsigned long flash_baseaddr = 0, size;
while (flash->name != NULL) {
if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0) {
flash++;
for (; flash && flash->name; flash++) {
if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0)
continue;
}
printf_debug("Probing for %s %s, %d KB: ",
flash->vendor, flash->name, flash->total_size);
if (!flash->probe && !force) {
printf_debug("failed! flashrom has no probe function for this flash chip.\n");
flash++;
continue;
}
@ -150,18 +147,21 @@ struct flashchip *probe_flash(struct flashchip *flash, int force)
}
flash->virtual_memory = bios;
if (force || flash->probe(flash) == 1) {
printf("Found chip \"%s %s\" (%d KB) at physical address 0x%lx.\n",
flash->vendor, flash->name, flash->total_size,
flash_baseaddr);
return flash;
}
if (force)
break;
if (flash->probe(flash) == 1)
break;
munmap((void *)bios, size);
flash++;
}
if (!flash || !flash->name)
return NULL;
printf("Found chip \"%s %s\" (%d KB) at physical address 0x%lx.\n",
flash->vendor, flash->name, flash->total_size, flash_baseaddr);
return flash;
}
int verify_flash(struct flashchip *flash, uint8_t *buf)