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>
diff --git a/chipdrivers.h b/chipdrivers.h
index e2c698b..e7261e0 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -46,7 +46,7 @@
int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len);
uint8_t spi_read_status_register(void);
int spi_disable_blockprotect(void);
-int spi_byte_program(int addr, uint8_t byte);
+int spi_byte_program(int addr, uint8_t databyte);
int spi_nbyte_program(int addr, uint8_t *bytes, int len);
int spi_nbyte_read(int addr, uint8_t *bytes, int len);
int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize);
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_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;
diff --git a/spi.c b/spi.c
index 43dc4bf..952952f 100644
--- a/spi.c
+++ b/spi.c
@@ -832,7 +832,7 @@
return result;
}
-int spi_byte_program(int addr, uint8_t byte)
+int spi_byte_program(int addr, uint8_t databyte)
{
int result;
struct spi_command cmds[] = {
@@ -843,7 +843,7 @@
.readarr = NULL,
}, {
.writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE,
- .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), byte },
+ .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), databyte },
.readcnt = 0,
.readarr = NULL,
}, {