diff options
author | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2010-01-12 23:29:26 +0000 |
---|---|---|
committer | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2010-01-12 23:29:26 +0000 |
commit | e87c0af94fae8cda899b72f03d0829ec5f2ffec4 (patch) | |
tree | d670b18a3e72c7678e6391f1ef4f2ee9ae6a3c31 /chipset_enable.c | |
parent | fb47cb30a1ac587125f0237ae3c75a7026e5cceb (diff) | |
download | flashrom-e87c0af94fae8cda899b72f03d0829ec5f2ffec4.zip flashrom-e87c0af94fae8cda899b72f03d0829ec5f2ffec4.tar.gz |
Don't use "byte" as identifier
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>
Diffstat (limited to 'chipset_enable.c')
-rw-r--r-- | chipset_enable.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chipset_enable.c b/chipset_enable.c index f106f96..0f42c7f 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -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; |