[flashrom] [commit] r861 - trunk

[svn at flashrom.org]

Author: mkarcher
Date: 2010-01-13 00:29:26 +0100 (Wed, 13 Jan 2010)
New Revision: 861

Modified:
   trunk/chipdrivers.h
   trunk/chipset_enable.c
   trunk/spi.c
Log:
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".

Signed-off-by: Michael Karcher <flashrom at mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified: trunk/chipdrivers.h
===================================================================
--- trunk/chipdrivers.h	2010-01-12 15:36:24 UTC (rev 860)
+++ trunk/chipdrivers.h	2010-01-12 23:29:26 UTC (rev 861)
@@ -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);

Modified: trunk/chipset_enable.c
===================================================================
--- trunk/chipset_enable.c	2010-01-12 15:36:24 UTC (rev 860)
+++ trunk/chipset_enable.c	2010-01-12 23:29:26 UTC (rev 861)
@@ -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;

Modified: trunk/spi.c
===================================================================
--- trunk/spi.c	2010-01-12 15:36:24 UTC (rev 860)
+++ trunk/spi.c	2010-01-12 23:29:26 UTC (rev 861)
@@ -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,
 	}, {