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 | 4e2fb0ee3ebbdf1f2da6ca1a3937f63eeac647b4 (patch) | |
| tree | d670b18a3e72c7678e6391f1ef4f2ee9ae6a3c31 /spi.c | |
| parent | e7f3209487b8adb681dd720f9ae512c8ded26f6e (diff) | |
| download | flashrom-4e2fb0ee3ebbdf1f2da6ca1a3937f63eeac647b4.tar.gz flashrom-4e2fb0ee3ebbdf1f2da6ca1a3937f63eeac647b4.tar.bz2 flashrom-4e2fb0ee3ebbdf1f2da6ca1a3937f63eeac647b4.zip | |
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 'spi.c')
| -rw-r--r-- | spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -832,7 +832,7 @@ int spi_write_status_register(int status) 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 @@ int spi_byte_program(int addr, uint8_t byte) .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, }, { |