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 /chipdrivers.h | |
| 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 'chipdrivers.h')
| -rw-r--r-- | chipdrivers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chipdrivers.h b/chipdrivers.h index e2c698b62..e7261e071 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -46,7 +46,7 @@ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf); 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); |