diff options
| -rw-r--r-- | atahpt.c | 18 | ||||
| -rw-r--r-- | atapromise.c | 16 | ||||
| -rw-r--r-- | atavia.c | 16 | ||||
| -rw-r--r-- | developerbox_spi.c | 10 | ||||
| -rw-r--r-- | drkaiser.c | 16 | ||||
| -rw-r--r-- | dummyflasher.c | 24 | ||||
| -rw-r--r-- | ichspi.c | 58 | ||||
| -rw-r--r-- | internal.c | 16 | ||||
| -rw-r--r-- | it8212.c | 16 | ||||
| -rw-r--r-- | it85spi.c | 14 | ||||
| -rw-r--r-- | linux_mtd.c | 6 | ||||
| -rw-r--r-- | lspcon_i2c_spi.c | 16 | ||||
| -rw-r--r-- | mcp6x_spi.c | 14 | ||||
| -rw-r--r-- | mediatek_i2c_spi.c | 14 | ||||
| -rw-r--r-- | mstarddc_spi.c | 16 | ||||
| -rw-r--r-- | ni845x_spi.c | 16 | ||||
| -rw-r--r-- | nic3com.c | 18 | ||||
| -rw-r--r-- | nicintel.c | 16 | ||||
| -rw-r--r-- | nicintel_eeprom.c | 20 | ||||
| -rw-r--r-- | nicintel_spi.c | 18 | ||||
| -rw-r--r-- | nicnatsemi.c | 16 | ||||
| -rw-r--r-- | nicrealtek.c | 18 | ||||
| -rw-r--r-- | ogp_spi.c | 14 | ||||
| -rw-r--r-- | pony_spi.c | 10 | ||||
| -rw-r--r-- | raiden_debug_spi.c | 16 | ||||
| -rw-r--r-- | rayer_spi.c | 10 | ||||
| -rw-r--r-- | realtek_mst_i2c_spi.c | 16 | ||||
| -rw-r--r-- | satamv.c | 16 | ||||
| -rw-r--r-- | satasii.c | 16 | ||||
| -rw-r--r-- | sb600spi.c | 48 | ||||
| -rw-r--r-- | serprog.c | 16 | ||||
| -rw-r--r-- | stlinkv3_spi.c | 16 | ||||
| -rw-r--r-- | wbsio_spi.c | 16 |
33 files changed, 293 insertions, 293 deletions
@@ -65,15 +65,15 @@ static int atahpt_shutdown(void *par_data) } static const struct par_master par_master_atahpt = { - .chip_readb = atahpt_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = atahpt_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .shutdown = atahpt_shutdown, + .chip_readb = atahpt_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = atahpt_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .shutdown = atahpt_shutdown, }; static int atahpt_init(void) diff --git a/atapromise.c b/atapromise.c index d781190b5..aefa7efe9 100644 --- a/atapromise.c +++ b/atapromise.c @@ -108,14 +108,14 @@ static uint8_t atapromise_chip_readb(const struct flashctx *flash, const chipadd } static const struct par_master par_master_atapromise = { - .chip_readb = atapromise_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = atapromise_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = atapromise_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = atapromise_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int atapromise_init(void) @@ -133,14 +133,14 @@ static uint8_t atavia_chip_readb(const struct flashctx *flash, const chipaddr ad } static const struct par_master lpc_master_atavia = { - .chip_readb = atavia_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = atavia_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = atavia_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = atavia_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int atavia_init(void) diff --git a/developerbox_spi.c b/developerbox_spi.c index 8c4a8df82..86b8f1e80 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -124,11 +124,11 @@ static void cp210x_bitbang_set_sck_set_mosi(int sck, int mosi, void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_cp210x = { - .set_cs = cp210x_bitbang_set_cs, - .set_sck = cp210x_bitbang_set_sck, - .set_mosi = cp210x_bitbang_set_mosi, - .get_miso = cp210x_bitbang_get_miso, - .set_sck_set_mosi = cp210x_bitbang_set_sck_set_mosi, + .set_cs = cp210x_bitbang_set_cs, + .set_sck = cp210x_bitbang_set_sck, + .set_mosi = cp210x_bitbang_set_mosi, + .get_miso = cp210x_bitbang_get_miso, + .set_sck_set_mosi = cp210x_bitbang_set_sck_set_mosi, }; static int developerbox_spi_shutdown(void *spi_data) diff --git a/drkaiser.c b/drkaiser.c index 0849109f0..2790555e4 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -51,14 +51,14 @@ static uint8_t drkaiser_chip_readb(const struct flashctx *flash, } static const struct par_master par_master_drkaiser = { - .chip_readb = drkaiser_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = drkaiser_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = drkaiser_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = drkaiser_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int drkaiser_init(void) diff --git a/dummyflasher.c b/dummyflasher.c index 603e545e3..faccb5f79 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -919,21 +919,21 @@ static const struct spi_master spi_master_dummyflasher = { }; static const struct par_master par_master_dummyflasher = { - .chip_readb = dummy_chip_readb, - .chip_readw = dummy_chip_readw, - .chip_readl = dummy_chip_readl, - .chip_readn = dummy_chip_readn, - .chip_writeb = dummy_chip_writeb, - .chip_writew = dummy_chip_writew, - .chip_writel = dummy_chip_writel, - .chip_writen = dummy_chip_writen, + .chip_readb = dummy_chip_readb, + .chip_readw = dummy_chip_readw, + .chip_readl = dummy_chip_readl, + .chip_readn = dummy_chip_readn, + .chip_writeb = dummy_chip_writeb, + .chip_writew = dummy_chip_writew, + .chip_writel = dummy_chip_writel, + .chip_writen = dummy_chip_writen, }; static const struct opaque_master opaque_master_dummyflasher = { - .probe = probe_variable_size, - .read = dummy_opaque_read, - .write = dummy_opaque_write, - .erase = dummy_opaque_erase, + .probe = probe_variable_size, + .read = dummy_opaque_read, + .write = dummy_opaque_write, + .erase = dummy_opaque_erase, }; static int init_data(struct emu_data *data, enum chipbustype *dummy_buses_supported) @@ -1785,34 +1785,34 @@ static void ich9_set_pr(const size_t reg_pr0, int i, int read_prot, int write_pr } static const struct spi_master spi_master_ich7 = { - .max_data_read = 64, - .max_data_write = 64, - .command = ich_spi_send_command, - .multicommand = ich_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .max_data_read = 64, + .max_data_write = 64, + .command = ich_spi_send_command, + .multicommand = ich_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct spi_master spi_master_ich9 = { - .max_data_read = 64, - .max_data_write = 64, - .command = ich_spi_send_command, - .multicommand = ich_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .max_data_read = 64, + .max_data_write = 64, + .command = ich_spi_send_command, + .multicommand = ich_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct opaque_master opaque_master_ich_hwseq = { - .max_data_read = 64, - .max_data_write = 64, - .probe = ich_hwseq_probe, - .read = ich_hwseq_read, - .write = ich_hwseq_write, - .erase = ich_hwseq_block_erase, - .read_register = ich_hwseq_read_status, - .write_register = ich_hwseq_write_status, + .max_data_read = 64, + .max_data_write = 64, + .probe = ich_hwseq_probe, + .read = ich_hwseq_read, + .write = ich_hwseq_write, + .erase = ich_hwseq_block_erase, + .read_register = ich_hwseq_read_status, + .write_register = ich_hwseq_write_status, }; static int init_ich7_spi(void *spibar, enum ich_chipset ich_gen) @@ -2208,13 +2208,13 @@ int ich_init_spi(void *spibar, enum ich_chipset ich_gen) } static const struct spi_master spi_master_via = { - .max_data_read = 16, - .max_data_write = 16, - .command = ich_spi_send_command, - .multicommand = ich_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .max_data_read = 16, + .max_data_write = 16, + .command = ich_spi_send_command, + .multicommand = ich_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int via_init_spi(uint32_t mmio_base) diff --git a/internal.c b/internal.c index 4049ef152..ca34b214d 100644 --- a/internal.c +++ b/internal.c @@ -106,14 +106,14 @@ static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf, } static const struct par_master par_master_internal = { - .chip_readb = internal_chip_readb, - .chip_readw = internal_chip_readw, - .chip_readl = internal_chip_readl, - .chip_readn = internal_chip_readn, - .chip_writeb = internal_chip_writeb, - .chip_writew = internal_chip_writew, - .chip_writel = internal_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = internal_chip_readb, + .chip_readw = internal_chip_readw, + .chip_readl = internal_chip_readl, + .chip_readn = internal_chip_readn, + .chip_writeb = internal_chip_writeb, + .chip_writew = internal_chip_writew, + .chip_writel = internal_chip_writel, + .chip_writen = fallback_chip_writen, }; static int get_params(int *boardenable, int *boardmismatch, @@ -44,14 +44,14 @@ static uint8_t it8212_chip_readb(const struct flashctx *flash, const chipaddr ad } static const struct par_master par_master_it8212 = { - .chip_readb = it8212_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = it8212_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = it8212_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = it8212_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int it8212_init(void) @@ -282,13 +282,13 @@ static int it85xx_spi_send_command(const struct flashctx *flash, } static const struct spi_master spi_master_it85xx = { - .max_data_read = 64, - .max_data_write = 64, - .command = it85xx_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .max_data_read = 64, + .max_data_write = 64, + .command = it85xx_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, .shutdown = it85xx_shutdown, }; diff --git a/linux_mtd.c b/linux_mtd.c index 88488c0b2..102cd7d8a 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -437,9 +437,9 @@ static const struct opaque_master linux_mtd_opaque_master = { .write = linux_mtd_write, .erase = linux_mtd_erase, .shutdown = linux_mtd_shutdown, - .wp_read_cfg = linux_mtd_wp_read_cfg, - .wp_write_cfg = linux_mtd_wp_write_cfg, - .wp_get_ranges = linux_mtd_wp_get_available_ranges, + .wp_read_cfg = linux_mtd_wp_read_cfg, + .wp_write_cfg = linux_mtd_wp_write_cfg, + .wp_get_ranges = linux_mtd_wp_get_available_ranges, }; /* Returns 0 if setup is successful, non-zero to indicate error */ diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index f3c11d665..42e79f527 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -429,14 +429,14 @@ static int lspcon_i2c_spi_shutdown(void *data) } static const struct spi_master spi_master_i2c_lspcon = { - .max_data_read = 16, - .max_data_write = 12, - .command = lspcon_i2c_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = lspcon_i2c_spi_read, - .write_256 = lspcon_i2c_spi_write_256, - .write_aai = lspcon_i2c_spi_write_aai, - .shutdown = lspcon_i2c_spi_shutdown, + .max_data_read = 16, + .max_data_write = 12, + .command = lspcon_i2c_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = lspcon_i2c_spi_read, + .write_256 = lspcon_i2c_spi_write_256, + .write_aai = lspcon_i2c_spi_write_aai, + .shutdown = lspcon_i2c_spi_shutdown, }; static int lspcon_i2c_spi_init(void) diff --git a/mcp6x_spi.c b/mcp6x_spi.c index d136be479..78699251e 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -100,13 +100,13 @@ static int mcp6x_bitbang_get_miso(void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_mcp6x = { - .set_cs = mcp6x_bitbang_set_cs, - .set_sck = mcp6x_bitbang_set_sck, - .set_mosi = mcp6x_bitbang_set_mosi, - .get_miso = mcp6x_bitbang_get_miso, - .request_bus = mcp6x_request_spibus, - .release_bus = mcp6x_release_spibus, - .half_period = 0, + .set_cs = mcp6x_bitbang_set_cs, + .set_sck = mcp6x_bitbang_set_sck, + .set_mosi = mcp6x_bitbang_set_mosi, + .get_miso = mcp6x_bitbang_get_miso, + .request_bus = mcp6x_request_spibus, + .release_bus = mcp6x_release_spibus, + .half_period = 0, }; static int mcp6x_shutdown(void *spi_data) diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index 7d9610f15..4e7dbff48 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -440,14 +440,14 @@ static int mediatek_send_command(const struct flashctx *flash, } static const struct spi_master spi_master_i2c_mediatek = { - .max_data_read = I2C_SMBUS_BLOCK_MAX, + .max_data_read = I2C_SMBUS_BLOCK_MAX, // Leave room for 1-byte command and up to a 4-byte address. - .max_data_write = I2C_SMBUS_BLOCK_MAX - 5, - .command = mediatek_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .max_data_write = I2C_SMBUS_BLOCK_MAX - 5, + .command = mediatek_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static int mediatek_shutdown(void *data) diff --git a/mstarddc_spi.c b/mstarddc_spi.c index 71b02c0bb..c894b047b 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -138,14 +138,14 @@ static int mstarddc_spi_send_command(const struct flashctx *flash, } static const struct spi_master spi_master_mstarddc = { - .max_data_read = 256, - .max_data_write = 256, - .command = mstarddc_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = mstarddc_spi_shutdown, + .max_data_read = 256, + .max_data_write = 256, + .command = mstarddc_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = mstarddc_spi_shutdown, }; /* Returns 0 upon success, a negative number upon errors. */ diff --git a/ni845x_spi.c b/ni845x_spi.c index 18c0278c4..7c4e4fc2f 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -529,14 +529,14 @@ static int ni845x_spi_transmit(const struct flashctx *flash, } static const struct spi_master spi_programmer_ni845x = { - .max_data_read = MAX_DATA_READ_UNLIMITED, - .max_data_write = MAX_DATA_WRITE_UNLIMITED, - .command = ni845x_spi_transmit, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = ni845x_spi_shutdown, + .max_data_read = MAX_DATA_READ_UNLIMITED, + .max_data_write = MAX_DATA_WRITE_UNLIMITED, + .command = ni845x_spi_transmit, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = ni845x_spi_shutdown, }; static int ni845x_spi_init(void) @@ -90,15 +90,15 @@ static int nic3com_shutdown(void *par_data) } static const struct par_master par_master_nic3com = { - .chip_readb = nic3com_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nic3com_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .shutdown = nic3com_shutdown, + .chip_readb = nic3com_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nic3com_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .shutdown = nic3com_shutdown, }; static int nic3com_init(void) diff --git a/nicintel.c b/nicintel.c index fdc4eba2a..5ca87efe4 100644 --- a/nicintel.c +++ b/nicintel.c @@ -54,14 +54,14 @@ static uint8_t nicintel_chip_readb(const struct flashctx *flash, } static const struct par_master par_master_nicintel = { - .chip_readb = nicintel_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicintel_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = nicintel_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicintel_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int nicintel_init(void) diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index efd4232c3..42e6a7bb5 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -442,19 +442,19 @@ out: } static const struct opaque_master opaque_master_nicintel_ee_82580 = { - .probe = nicintel_ee_probe_82580, - .read = nicintel_ee_read, - .write = nicintel_ee_write_82580, - .erase = nicintel_ee_erase_82580, - .shutdown = nicintel_ee_shutdown_82580, + .probe = nicintel_ee_probe_82580, + .read = nicintel_ee_read, + .write = nicintel_ee_write_82580, + .erase = nicintel_ee_erase_82580, + .shutdown = nicintel_ee_shutdown_82580, }; static const struct opaque_master opaque_master_nicintel_ee_i210 = { - .probe = nicintel_ee_probe_i210, - .read = nicintel_ee_read, - .write = nicintel_ee_write_i210, - .erase = nicintel_ee_erase_i210, - .shutdown = nicintel_ee_shutdown_i210, + .probe = nicintel_ee_probe_i210, + .read = nicintel_ee_read, + .write = nicintel_ee_write_i210, + .erase = nicintel_ee_erase_i210, + .shutdown = nicintel_ee_shutdown_i210, }; static int nicintel_ee_init(void) diff --git a/nicintel_spi.c b/nicintel_spi.c index a422d3020..54d1c3c4c 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -200,15 +200,15 @@ static int nicintel_bitbang_set_sck_get_miso(int sck, void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_nicintel = { - .set_cs = nicintel_bitbang_set_cs, - .set_sck = nicintel_bitbang_set_sck, - .set_mosi = nicintel_bitbang_set_mosi, - .set_sck_set_mosi = nicintel_bitbang_set_sck_set_mosi, - .set_sck_get_miso = nicintel_bitbang_set_sck_get_miso, - .get_miso = nicintel_bitbang_get_miso, - .request_bus = nicintel_request_spibus, - .release_bus = nicintel_release_spibus, - .half_period = 1, + .set_cs = nicintel_bitbang_set_cs, + .set_sck = nicintel_bitbang_set_sck, + .set_mosi = nicintel_bitbang_set_mosi, + .set_sck_set_mosi = nicintel_bitbang_set_sck_set_mosi, + .set_sck_get_miso = nicintel_bitbang_set_sck_get_miso, + .get_miso = nicintel_bitbang_get_miso, + .request_bus = nicintel_request_spibus, + .release_bus = nicintel_release_spibus, + .half_period = 1, }; static int nicintel_spi_shutdown(void *spi_data) diff --git a/nicnatsemi.c b/nicnatsemi.c index bac650259..21ef337e6 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -64,14 +64,14 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash, } static const struct par_master par_master_nicnatsemi = { - .chip_readb = nicnatsemi_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicnatsemi_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = nicnatsemi_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicnatsemi_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int nicnatsemi_init(void) diff --git a/nicrealtek.c b/nicrealtek.c index 71f9aaf0e..ebe9dab57 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -86,15 +86,15 @@ static int nicrealtek_shutdown(void *data) } static const struct par_master par_master_nicrealtek = { - .chip_readb = nicrealtek_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicrealtek_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .shutdown = nicrealtek_shutdown, + .chip_readb = nicrealtek_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicrealtek_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .shutdown = nicrealtek_shutdown, }; static int nicrealtek_init(void) @@ -92,13 +92,13 @@ static int ogp_bitbang_get_miso(void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_ogp = { - .set_cs = ogp_bitbang_set_cs, - .set_sck = ogp_bitbang_set_sck, - .set_mosi = ogp_bitbang_set_mosi, - .get_miso = ogp_bitbang_get_miso, - .request_bus = ogp_request_spibus, - .release_bus = ogp_release_spibus, - .half_period = 0, + .set_cs = ogp_bitbang_set_cs, + .set_sck = ogp_bitbang_set_sck, + .set_mosi = ogp_bitbang_set_mosi, + .get_miso = ogp_bitbang_get_miso, + .request_bus = ogp_request_spibus, + .release_bus = ogp_release_spibus, + .half_period = 0, }; static int ogp_spi_shutdown(void *data) diff --git a/pony_spi.c b/pony_spi.c index 04191345e..57699a19d 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -100,11 +100,11 @@ static int pony_bitbang_get_miso(void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_pony = { - .set_cs = pony_bitbang_set_cs, - .set_sck = pony_bitbang_set_sck, - .set_mosi = pony_bitbang_set_mosi, - .get_miso = pony_bitbang_get_miso, - .half_period = 0, + .set_cs = pony_bitbang_set_cs, + .set_sck = pony_bitbang_set_sck, + .set_mosi = pony_bitbang_set_mosi, + .get_miso = pony_bitbang_get_miso, + .half_period = 0, }; static int pony_spi_shutdown(void *data) diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index f9ab3e04a..7e6a246f6 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1311,14 +1311,14 @@ static int raiden_debug_spi_shutdown(void * data) } static const struct spi_master spi_master_raiden_debug = { - .features = SPI_MASTER_4BA, - .max_data_read = 0, - .max_data_write = 0, - .command = NULL, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, + .features = SPI_MASTER_4BA, + .max_data_read = 0, + .max_data_write = 0, + .command = NULL, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, .shutdown = raiden_debug_spi_shutdown, }; diff --git a/rayer_spi.c b/rayer_spi.c index 6cf918a80..94e957e17 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -228,11 +228,11 @@ static int rayer_shutdown(void *spi_data) } static const struct bitbang_spi_master bitbang_spi_master_rayer = { - .set_cs = rayer_bitbang_set_cs, - .set_sck = rayer_bitbang_set_sck, - .set_mosi = rayer_bitbang_set_mosi, - .get_miso = rayer_bitbang_get_miso, - .half_period = 0, + .set_cs = rayer_bitbang_set_cs, + .set_sck = rayer_bitbang_set_sck, + .set_mosi = rayer_bitbang_set_mosi, + .get_miso = rayer_bitbang_get_miso, + .half_period = 0, }; static int rayer_spi_init(void) diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index c7de2fe7d..d37c9a912 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -434,14 +434,14 @@ static int realtek_mst_i2c_spi_shutdown(void *data) } static const struct spi_master spi_master_i2c_realtek_mst = { - .max_data_read = 16, - .max_data_write = 8, - .command = realtek_mst_i2c_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = realtek_mst_i2c_spi_read, - .write_256 = realtek_mst_i2c_spi_write_256, - .write_aai = realtek_mst_i2c_spi_write_aai, - .shutdown = realtek_mst_i2c_spi_shutdown, + .max_data_read = 16, + .max_data_write = 8, + .command = realtek_mst_i2c_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = realtek_mst_i2c_spi_read, + .write_256 = realtek_mst_i2c_spi_write_256, + .write_aai = realtek_mst_i2c_spi_write_aai, + .shutdown = realtek_mst_i2c_spi_shutdown, }; static int get_params(int *reset, int *enter_isp) @@ -75,14 +75,14 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash, } static const struct par_master par_master_satamv = { - .chip_readb = satamv_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = satamv_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = satamv_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = satamv_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; /* @@ -84,14 +84,14 @@ static uint8_t satasii_chip_readb(const struct flashctx *flash, const chipaddr a } static const struct par_master par_master_satasii = { - .chip_readb = satasii_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = satasii_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = satasii_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = satasii_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int satasii_init(void) diff --git a/sb600spi.c b/sb600spi.c index 94c4d9b48..3a88ab706 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -595,36 +595,36 @@ static int sb600spi_shutdown(void *data) } static const struct spi_master spi_master_sb600 = { - .max_data_read = FIFO_SIZE_OLD, - .max_data_write = FIFO_SIZE_OLD - 3, - .command = sb600_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = sb600spi_shutdown, + .max_data_read = FIFO_SIZE_OLD, + .max_data_write = FIFO_SIZE_OLD - 3, + .command = sb600_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = sb600spi_shutdown, }; static const struct spi_master spi_master_yangtze = { - .max_data_read = FIFO_SIZE_YANGTZE - 3, /* Apparently the big SPI 100 buffer is not a ring buffer. */ - .max_data_write = FIFO_SIZE_YANGTZE - 3, - .command = spi100_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = sb600spi_shutdown, + .max_data_read = FIFO_SIZE_YANGTZE - 3, /* Apparently the big SPI 100 buffer is not a ring buffer. */ + .max_data_write = FIFO_SIZE_YANGTZE - 3, + .command = spi100_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = sb600spi_shutdown, }; static const struct spi_master spi_master_promontory = { - .max_data_read = MAX_DATA_READ_UNLIMITED, - .max_data_write = FIFO_SIZE_YANGTZE - 3, - .command = spi100_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = promontory_read_memmapped, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = sb600spi_shutdown, + .max_data_read = MAX_DATA_READ_UNLIMITED, + .max_data_write = FIFO_SIZE_YANGTZE - 3, + .command = spi100_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = promontory_read_memmapped, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = sb600spi_shutdown, }; int sb600_probe_spi(struct pci_dev *dev) @@ -551,14 +551,14 @@ static void serprog_chip_readn(const struct flashctx *flash, uint8_t * buf, } static const struct par_master par_master_serprog = { - .chip_readb = serprog_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = serprog_chip_readn, - .chip_writeb = serprog_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = serprog_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = serprog_chip_readn, + .chip_writeb = serprog_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static enum chipbustype serprog_buses_supported = BUS_NONE; diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index bbcad47ee..07caf6f17 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -460,14 +460,14 @@ static int stlinkv3_spi_shutdown(void *data) } static const struct spi_master spi_programmer_stlinkv3 = { - .max_data_read = UINT16_MAX, - .max_data_write = UINT16_MAX, - .command = stlinkv3_spi_transmit, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = stlinkv3_spi_shutdown, + .max_data_read = UINT16_MAX, + .max_data_write = UINT16_MAX, + .command = stlinkv3_spi_transmit, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = stlinkv3_spi_shutdown, }; static int stlinkv3_spi_init(void) diff --git a/wbsio_spi.c b/wbsio_spi.c index 27944911a..06bb556bc 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -183,14 +183,14 @@ static int wbsio_spi_shutdown(void *data) } static const struct spi_master spi_master_wbsio = { - .max_data_read = MAX_DATA_UNSPECIFIED, - .max_data_write = MAX_DATA_UNSPECIFIED, - .command = wbsio_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = wbsio_spi_read, - .write_256 = spi_chip_write_1, - .write_aai = spi_chip_write_1, - .shutdown = wbsio_spi_shutdown, + .max_data_read = MAX_DATA_UNSPECIFIED, + .max_data_write = MAX_DATA_UNSPECIFIED, + .command = wbsio_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = wbsio_spi_read, + .write_256 = spi_chip_write_1, + .write_aai = spi_chip_write_1, + .shutdown = wbsio_spi_shutdown, }; int wbsio_check_for_spi(void) |