1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 22:43:17 +02:00

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>
This commit is contained in:
Carl-Daniel Hailfinger
2009-05-27 11:40:08 +00:00
parent 09b4fb73f2
commit 2ad267d8cd
2 changed files with 26 additions and 28 deletions

View File

@ -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);