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

Rename identifiers called 'byte'

Browse Source 
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.

Corresponding to flashrom svn r913.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Michael Karcher 2010-02-25 11:38:23 +00:00
parent f6498d7a44
commit cfa674fde7
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
chipset_enable.c
View File

@ -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) static int enable_flash_mcp6x_7x_common(struct pci_dev *dev, const char *name)
{ {
int ret = 0; int ret = 0;
uint8_t byte; uint8_t val;
uint16_t status; uint16_t status;
char *busname; char *busname;
uint32_t mcp_spibaraddr; 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"); msg_pinfo("This chipset is not really supported yet. Guesswork...\n");
/* dev is the ISA bridge. No idea what the stuff below does. */ /* dev is the ISA bridge. No idea what the stuff below does. */
byte = pci_read_byte(dev, 0x8a); val = pci_read_byte(dev, 0x8a);
msg_pdbg("ISA/LPC bridge reg 0x8a contents: 0x%02x, bit 6 is %i, bit 5 " 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); "is %i\n", val, (val >> 6) & 0x1, (val >> 5) & 0x1);
switch ((byte >> 5) & 0x3) { switch ((val >> 5) & 0x3) {
case 0x0: case 0x0:
buses_supported = CHIP_BUSTYPE_LPC; buses_supported = CHIP_BUSTYPE_LPC;
break; 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. */ /* Force enable SPI and disable LPC? Not a good idea. */
#if 0 #if 0
byte |= (1 << 6); val |= (1 << 6);
byte &= ~(1 << 5); val &= ~(1 << 5);
pci_write_byte(dev, 0x8a, byte); pci_write_byte(dev, 0x8a, val);
#endif #endif
/* Look for the SMBus device (SMBus PCI class) */ /* 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) static int enable_flash_ht1000(struct pci_dev *dev, const char *name)
{ {
uint8_t byte; uint8_t val;
/* Set the 4MB enable bit. */ /* Set the 4MB enable bit. */
byte = pci_read_byte(dev, 0x41); val = pci_read_byte(dev, 0x41);
byte |= 0x0e; val |= 0x0e;
pci_write_byte(dev, 0x41, byte); pci_write_byte(dev, 0x41, val);
byte = pci_read_byte(dev, 0x43); val = pci_read_byte(dev, 0x43);
byte |= (1 << 4); val |= (1 << 4);
pci_write_byte(dev, 0x43, byte); pci_write_byte(dev, 0x43, val);
return 0; return 0;
} }