diff options
| -rw-r--r-- | ichspi.c | 2 | ||||
| -rw-r--r-- | spi25.c | 6 | ||||
| -rw-r--r-- | util/ich_descriptors_tool/ich_descriptors_tool.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1704,7 +1704,7 @@ int ich_init_spi(void *spibar, enum ich_chipset ich_gen) char *arg; int ich_spi_rw_restricted = 0; int desc_valid = 0; - struct ich_descriptors desc = {{ 0 }}; + struct ich_descriptors desc = { 0 }; enum ich_spi_mode { ich_auto, ich_hwseq, @@ -321,9 +321,11 @@ static int spi_simple_write_cmd(struct flashctx *const flash, const uint8_t op, { struct spi_command cmds[] = { { + .readarr = 0, .writecnt = 1, .writearr = (const unsigned char[]){ JEDEC_WREN }, }, { + .readarr = 0, .writecnt = 1, .writearr = (const unsigned char[]){ op }, }, @@ -344,9 +346,11 @@ static int spi_write_extended_address_register(struct flashctx *const flash, con const uint8_t op = flash->chip->wrea_override ? : JEDEC_WRITE_EXT_ADDR_REG; struct spi_command cmds[] = { { + .readarr = 0, .writecnt = 1, .writearr = (const unsigned char[]){ JEDEC_WREN }, }, { + .readarr = 0, .writecnt = 2, .writearr = (const unsigned char[]){ op, regdata }, }, @@ -419,9 +423,11 @@ static int spi_write_cmd(struct flashctx *const flash, const uint8_t op, uint8_t cmd[1 + JEDEC_MAX_ADDR_LEN + 256]; struct spi_command cmds[] = { { + .readarr = 0, .writecnt = 1, .writearr = (const unsigned char[]){ JEDEC_WREN }, }, { + .readarr = 0, .writearr = cmd, }, NULL_SPI_CMD, diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index aec97d0f..aa857c88 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) const char *fn = NULL; const char *csn = NULL; enum ich_chipset cs = CHIPSET_ICH_UNKNOWN; - struct ich_descriptors desc = {{ 0 }}; + struct ich_descriptors desc = { 0 }; while ((opt = getopt(argc, argv, "df:c:")) != -1) { switch (opt) { |