diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-05-27 11:40:08 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-05-27 11:40:08 +0000 |
| commit | 2ad267d8cd61a49908f6b436fd81779839fc6541 (patch) | |
| tree | f0667f61e5b2266c1b9d65c32abc65453191c643 /w39v080fa.c | |
| parent | 09b4fb73f28c85536617a15d16f90aaa4ab27f3c (diff) | |
| download | flashrom-2ad267d8cd61a49908f6b436fd81779839fc6541.tar.gz flashrom-2ad267d8cd61a49908f6b436fd81779839fc6541.tar.bz2 flashrom-2ad267d8cd61a49908f6b436fd81779839fc6541.zip | |
Use consistent naming for local chip ID variables
Every chip besides SPI and w39v080fa uses id1/id2 as local variable
names to store ID responses from the flash chip. This eases grepping a
lot. As a bonus, it also frees up some names to be used as parameters.
Corresponding to flashrom svn r551.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
Diffstat (limited to 'w39v080fa.c')
| -rw-r--r-- | w39v080fa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/w39v080fa.c b/w39v080fa.c index 36abbfdc8..ba4673a9f 100644 --- a/w39v080fa.c +++ b/w39v080fa.c @@ -23,7 +23,7 @@ int probe_winbond_fwhub(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t vid, did; + uint8_t id1, id2; /* Product Identification Entry */ chip_writeb(0xAA, bios + 0x5555); @@ -32,8 +32,8 @@ int probe_winbond_fwhub(struct flashchip *flash) myusec_delay(10); /* Read product ID */ - vid = chip_readb(bios); - did = chip_readb(bios + 0x01); + id1 = chip_readb(bios); + id2 = chip_readb(bios + 0x01); /* Product Identifixation Exit */ chip_writeb(0xAA, bios + 0x5555); @@ -41,9 +41,9 @@ int probe_winbond_fwhub(struct flashchip *flash) chip_writeb(0xF0, bios + 0x5555); myusec_delay(10); - printf_debug("%s: vid 0x%x, did 0x%x\n", __FUNCTION__, vid, did); + printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - if (vid != flash->manufacture_id || did != flash->model_id) + if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; map_flash_registers(flash); |