Still fallout of adding "-Wshadow". Missed the ht1000 one (chipset_enable is not compied on Windows where we had the collision with "byte" last time) and the other occurrence is newly introduced. Old libpci defines a global symbol called "byte" too.
Signed-off-by: Michael Karcher <[email protected]> --- chipset_enable.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chipset_enable.c b/chipset_enable.c index 1830eb2..4182faa 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1060,7 +1060,7 @@ static int enable_flash_mcp55(struct pci_dev *dev, const char *name) static int enable_flash_mcp6x_7x_common(struct pci_dev *dev, const char *name) { int ret = 0; - uint8_t byte; + uint8_t lpc_8a; uint16_t status; char *busname; uint32_t mcp_spibaraddr; @@ -1070,10 +1070,10 @@ static int enable_flash_mcp6x_7x_common(struct pci_dev *dev, const char *name) msg_pinfo("This chipset is not really supported yet. Guesswork...\n"); /* dev is the ISA bridge. No idea what the stuff below does. */ - byte = pci_read_byte(dev, 0x8a); + lpc_8a = pci_read_byte(dev, 0x8a); msg_pdbg("ISA/LPC bridge reg 0x8a contents: 0x%02x, bit 6 is %i, bit 5 " - "is %i\n", byte, (byte >> 6) & 0x1, (byte >> 5) & 0x1); - switch ((byte >> 5) & 0x3) { + "is %i\n", lpc_8a, (lpc_8a >> 6) & 0x1, (lpc_8a >> 5) & 0x1); + switch ((lpc_8a >> 5) & 0x3) { case 0x0: buses_supported = CHIP_BUSTYPE_LPC; break; @@ -1090,9 +1090,9 @@ static int enable_flash_mcp6x_7x_common(struct pci_dev *dev, const char *name) /* Force enable SPI and disable LPC? Not a good idea. */ #if 0 - byte |= (1 << 6); - byte &= ~(1 << 5); - pci_write_byte(dev, 0x8a, byte); + lpc_8a |= (1 << 6); + lpc_8a &= ~(1 << 5); + pci_write_byte(dev, 0x8a, lpc_8a); #endif /* Look for the SMBus device (SMBus PCI class) */ @@ -1224,16 +1224,16 @@ static int enable_flash_mcp7x(struct pci_dev *dev, const char *name) static int enable_flash_ht1000(struct pci_dev *dev, const char *name) { - uint8_t byte; + uint8_t val; /* Set the 4MB enable bit. */ - byte = pci_read_byte(dev, 0x41); - byte |= 0x0e; - pci_write_byte(dev, 0x41, byte); + val = pci_read_byte(dev, 0x41); + val |= 0x0e; + pci_write_byte(dev, 0x41, val); - byte = pci_read_byte(dev, 0x43); - byte |= (1 << 4); - pci_write_byte(dev, 0x43, byte); + val = pci_read_byte(dev, 0x43); + val |= (1 << 4); + pci_write_byte(dev, 0x43, val); return 0; } -- 1.6.5 _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
