openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

Shadowing fix in nicintel_eeprom.c for ancient libpci

Browse Source 
Very old versions (<2.2) of pciutils had a typedef named "word" in
types.h. That does not play well with previous local variable names
of nicintel_eeprom.c.

Corresponding to flashrom svn r1874.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2015-01-25 23:45:14 +00:00
parent 05151b6dcb
commit 3e6b7bb948
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nicintel_eeprom.c
View File

@ -103,7 +103,7 @@ static int nicintel_ee_probe(struct flashctx *flash)
return 1; return 1;
} }
static int nicintel_ee_read_word(unsigned int addr, uint16_t *word) static int nicintel_ee_read_word(unsigned int addr, uint16_t *data)
{ {
uint32_t tmp = BIT(EERD_START) | (addr << EERD_ADDR); uint32_t tmp = BIT(EERD_START) | (addr << EERD_ADDR);
pci_mmio_writel(tmp, nicintel_eebar + EERD); pci_mmio_writel(tmp, nicintel_eebar + EERD);
@ -113,7 +113,7 @@ static int nicintel_ee_read_word(unsigned int addr, uint16_t *word)
for (i = 0; i < 10000000; i++) { for (i = 0; i < 10000000; i++) {
tmp = pci_mmio_readl(nicintel_eebar + EERD); tmp = pci_mmio_readl(nicintel_eebar + EERD);
if (tmp & BIT(EERD_DONE)) { if (tmp & BIT(EERD_DONE)) {
*word = (tmp >> EERD_DATA) & 0xffff; *data = (tmp >> EERD_DATA) & 0xffff;
return 0; return 0;
} }
} }
@ -123,26 +123,26 @@ static int nicintel_ee_read_word(unsigned int addr, uint16_t *word)
static int nicintel_ee_read(struct flashctx *flash, uint8_t *buf, unsigned int addr, unsigned int len) static int nicintel_ee_read(struct flashctx *flash, uint8_t *buf, unsigned int addr, unsigned int len)
{ {
uint16_t word; uint16_t data;
/* The NIC interface always reads 16 b words so we need to convert the address and handle odd address /* The NIC interface always reads 16 b words so we need to convert the address and handle odd address
* explicitly at the start (and also at the end in the loop below). */ * explicitly at the start (and also at the end in the loop below). */
if (addr & 1) { if (addr & 1) {
if (nicintel_ee_read_word(addr / 2, &word)) if (nicintel_ee_read_word(addr / 2, &data))
return -1; return -1;
*buf++ = word & 0xff; *buf++ = data & 0xff;
addr++; addr++;
len--; len--;
} }
while (len > 0) { while (len > 0) {
if (nicintel_ee_read_word(addr / 2, &word)) if (nicintel_ee_read_word(addr / 2, &data))
return -1; return -1;
*buf++ = word & 0xff; *buf++ = data & 0xff;
addr++; addr++;
len--; len--;
if (len > 0) { if (len > 0) {
*buf++ = (word >> 8) & 0xff; *buf++ = (data >> 8) & 0xff;
addr++; addr++;
len--; len--;
} }