openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 14:33:18 +02:00
Code Issues Releases Wiki Activity

Don't use "byte" as identifier

Browse Source 
Some mingw declares a global identifier "byte", causing -Werror -Wshadow
to break compilation. This patch renames all identifiers called "byte".

Corresponding to flashrom svn r861.

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-01-12 23:29:26 +00:00
parent e7f3209487
commit 4e2fb0ee3e
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
chipset_enable.c
View File

@ -1026,19 +1026,19 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name)
static int enable_flash_mcp55(struct pci_dev *dev, const char *name)
{
uint8_t old, new, byte;
uint16_t word;
uint8_t old, new, val;
uint16_t wordval;
/* Set the 0-16 MB enable bits. */
byte = pci_read_byte(dev, 0x88);
byte |= 0xff; /* 256K */
pci_write_byte(dev, 0x88, byte);
byte = pci_read_byte(dev, 0x8c);
byte |= 0xff; /* 1M */
pci_write_byte(dev, 0x8c, byte);
word = pci_read_word(dev, 0x90);
word |= 0x7fff; /* 16M */
pci_write_word(dev, 0x90, word);
val = pci_read_byte(dev, 0x88);
val |= 0xff; /* 256K */
pci_write_byte(dev, 0x88, val);
val = pci_read_byte(dev, 0x8c);
val |= 0xff; /* 1M */
pci_write_byte(dev, 0x8c, val);
wordval = pci_read_word(dev, 0x90);
wordval |= 0x7fff; /* 16M */
pci_write_word(dev, 0x90, wordval);
old = pci_read_byte(dev, 0x6d);
new = old | 0x01;