Author: mkarcher Date: Sun Jul 18 01:27:47 2010 New Revision: 1091 URL: http://flashrom.org/trac/coreboot/changeset/1091
Log: Use struct pointer instead of enum to set bitbang adapter
Signed-off-by: Michael Karcher flashrom@mkarcher.dialup.fu-berlin.de Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Modified: trunk/bitbang_spi.c trunk/flash.h trunk/flashrom.c
Modified: trunk/bitbang_spi.c ============================================================================== --- trunk/bitbang_spi.c Sun Jul 18 01:21:12 2010 (r1090) +++ trunk/bitbang_spi.c Sun Jul 18 01:27:47 2010 (r1091) @@ -29,45 +29,34 @@ /* Length of half a clock period in usecs. */ static int bitbang_spi_half_period;
-static enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID; - -static const struct bitbang_spi_master_entry bitbang_spi_master_table[] = { - {}, /* This entry corresponds to BITBANG_SPI_INVALID. */ -}; - -const int bitbang_spi_master_count = ARRAY_SIZE(bitbang_spi_master_table); +static const struct bitbang_spi_master *bitbang_spi_master = NULL;
/* Note that CS# is active low, so val=0 means the chip is active. */ static void bitbang_spi_set_cs(int val) { - bitbang_spi_master_table[bitbang_spi_master].set_cs(val); + bitbang_spi_master->set_cs(val); }
static void bitbang_spi_set_sck(int val) { - bitbang_spi_master_table[bitbang_spi_master].set_sck(val); + bitbang_spi_master->set_sck(val); }
static void bitbang_spi_set_mosi(int val) { - bitbang_spi_master_table[bitbang_spi_master].set_mosi(val); + bitbang_spi_master->set_mosi(val); }
static int bitbang_spi_get_miso(void) { - return bitbang_spi_master_table[bitbang_spi_master].get_miso(); + return bitbang_spi_master->get_miso(); }
-int bitbang_spi_init(enum bitbang_spi_master master, int halfperiod) +int bitbang_spi_init(const struct bitbang_spi_master *master, int halfperiod) { bitbang_spi_master = master; bitbang_spi_half_period = halfperiod;
- if (bitbang_spi_master == BITBANG_SPI_INVALID) { - msg_perr("Invalid bitbang SPI master. \n" - "Please report a bug at flashrom@flashrom.org\n"); - return 1; - } bitbang_spi_set_cs(1); bitbang_spi_set_sck(0); bitbang_spi_set_mosi(0);
Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Jul 18 01:21:12 2010 (r1090) +++ trunk/flash.h Sun Jul 18 01:27:47 2010 (r1091) @@ -127,13 +127,14 @@ void chip_readn(uint8_t *buf, const chipaddr addr, size_t len); void programmer_delay(int usecs);
-enum bitbang_spi_master { - BITBANG_SPI_INVALID /* This must always be the last entry. */ +enum bitbang_spi_master_type { + BITBANG_SPI_DUMMY /* remove as soon as there is a real entry */ };
-extern const int bitbang_spi_master_count; +struct bitbang_spi_master { + enum bitbang_spi_master_type type;
-struct bitbang_spi_master_entry { + /* Note that CS# is active low, so val=0 means the chip is active. */ void (*set_cs) (int val); void (*set_sck) (int val); void (*set_mosi) (int val); @@ -531,7 +532,7 @@ int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);
/* bitbang_spi.c */ -int bitbang_spi_init(enum bitbang_spi_master master, int halfperiod); +int bitbang_spi_init(const struct bitbang_spi_master *master, int halfperiod); 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); int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);
Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jul 18 01:21:12 2010 (r1090) +++ trunk/flashrom.c Sun Jul 18 01:27:47 2010 (r1091) @@ -1358,12 +1358,6 @@ msg_gerr("SPI programmer table miscompilation!\n"); ret = 1; } -#if CONFIG_BITBANG_SPI == 1 - if (bitbang_spi_master_count - 1 != BITBANG_SPI_INVALID) { - msg_gerr("Bitbanging SPI master table miscompilation!\n"); - ret = 1; - } -#endif for (flash = flashchips; flash && flash->name; flash++) if (selfcheck_eraseblocks(flash)) ret = 1;