openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Use struct pointer instead of enum to set bitbang adapter

Browse Source 
Corresponding to flashrom svn r1091.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Michael Karcher 2010-07-17 23:27:47 +00:00
parent f7533420b4
commit 62175a094d
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bitbang_spi.c
View File

@ -29,45 +29,34 @@
/* Length of half a clock period in usecs. */ /* Length of half a clock period in usecs. */
static int bitbang_spi_half_period; static int bitbang_spi_half_period;
static enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID; static const struct bitbang_spi_master *bitbang_spi_master = NULL;
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);
/* Note that CS# is active low, so val=0 means the chip is active. */ /* Note that CS# is active low, so val=0 means the chip is active. */
static void bitbang_spi_set_cs(int val) 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) 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) 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) 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_master = master;
bitbang_spi_half_period = halfperiod; 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_cs(1);
bitbang_spi_set_sck(0); bitbang_spi_set_sck(0);
bitbang_spi_set_mosi(0); bitbang_spi_set_mosi(0);

11
flash.h
View File

@ -127,13 +127,14 @@ uint32_t chip_readl(const chipaddr addr);
void chip_readn(uint8_t *buf, const chipaddr addr, size_t len); void chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
void programmer_delay(int usecs); void programmer_delay(int usecs);
enum bitbang_spi_master { enum bitbang_spi_master_type {
BITBANG_SPI_INVALID /* This must always be the last entry. */ 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_cs) (int val);
void (*set_sck) (int val); void (*set_sck) (int val);
void (*set_mosi) (int val); void (*set_mosi) (int val);
@ -531,7 +532,7 @@ 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, int start, int len); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);
/* bitbang_spi.c */ /* 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_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_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); int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);

6
flashrom.c
View File

@ -1358,12 +1358,6 @@ int selfcheck(void)
msg_gerr("SPI programmer table miscompilation!\n"); msg_gerr("SPI programmer table miscompilation!\n");
ret = 1; 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++) for (flash = flashchips; flash && flash->name; flash++)
if (selfcheck_eraseblocks(flash)) if (selfcheck_eraseblocks(flash))
ret = 1; ret = 1;