Author: stefanct Date: Mon Jan 26 00:45:14 2015 New Revision: 1874 URL: http://flashrom.org/trac/flashrom/changeset/1874
Log: Shadowing fix in nicintel_eeprom.c for ancient libpci.
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.
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at Acked-by: Stefan Tauner stefan.tauner@alumni.tuwien.ac.at
Modified: trunk/nicintel_eeprom.c
Modified: trunk/nicintel_eeprom.c ============================================================================== --- trunk/nicintel_eeprom.c Mon Jan 26 00:42:57 2015 (r1873) +++ trunk/nicintel_eeprom.c Mon Jan 26 00:45:14 2015 (r1874) @@ -103,7 +103,7 @@ 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); pci_mmio_writel(tmp, nicintel_eebar + EERD); @@ -113,7 +113,7 @@ for (i = 0; i < 10000000; i++) { tmp = pci_mmio_readl(nicintel_eebar + EERD); if (tmp & BIT(EERD_DONE)) { - *word = (tmp >> EERD_DATA) & 0xffff; + *data = (tmp >> EERD_DATA) & 0xffff; return 0; } } @@ -123,26 +123,26 @@
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 * explicitly at the start (and also at the end in the loop below). */ if (addr & 1) { - if (nicintel_ee_read_word(addr / 2, &word)) + if (nicintel_ee_read_word(addr / 2, &data)) return -1; - *buf++ = word & 0xff; + *buf++ = data & 0xff; addr++; len--; }
while (len > 0) { - if (nicintel_ee_read_word(addr / 2, &word)) + if (nicintel_ee_read_word(addr / 2, &data)) return -1; - *buf++ = word & 0xff; + *buf++ = data & 0xff; addr++; len--; if (len > 0) { - *buf++ = (word >> 8) & 0xff; + *buf++ = (data >> 8) & 0xff; addr++; len--; }