Make bitbang_spi naming consistent

Corresponding to flashrom svn r741.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>

1 files changed, 7 insertions, 7 deletions

diff --git a/flash.h b/flash.h
index b5b9ff5a0..c7525b4ab 100644
--- a/flash.h
+++ b/flash.h
@@ -148,15 +148,15 @@ uint32_t chip_readl(const chipaddr addr);
 void chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
 void programmer_delay(int usecs);
 
-enum spi_bitbang_master {
-	SPI_BITBANG_INVALID /* This must always be the last entry. */
+enum bitbang_spi_master {
+	BITBANG_SPI_INVALID /* This must always be the last entry. */
 };
 
-extern const int spi_bitbang_master_count;
+extern const int bitbang_spi_master_count;
 
-extern enum spi_bitbang_master spi_bitbang_master;
+extern enum bitbang_spi_master bitbang_spi_master;
 
-struct spi_bitbang_master_entry {
+struct bitbang_spi_master_entry {
 	void (*set_cs) (int val);
 	void (*set_sck) (int val);
 	void (*set_mosi) (int val);
@@ -470,8 +470,8 @@ int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf);
 
 /* bitbang_spi.c */
-extern int bitbang_half_period;
-extern const struct spi_bitbang_master_entry spi_bitbang_master_table[];
+extern int bitbang_spi_half_period;
+extern const struct bitbang_spi_master_entry bitbang_spi_master_table[];
 int bitbang_spi_init(void);
 int bitbang_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
 int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);