diff options
-rw-r--r-- | opaque.c | 2 | ||||
-rw-r--r-- | programmer.c | 3 | ||||
-rw-r--r-- | programmer.h | 2 | ||||
-rw-r--r-- | spi.c | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -48,7 +48,7 @@ int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int bl int register_opaque_master(const struct opaque_master *mst) { - struct registered_master rmst; + struct registered_master rmst = {0}; if (!mst->probe || !mst->read || !mst->write || !mst->erase) { msg_perr("%s called with incomplete master definition. " diff --git a/programmer.c b/programmer.c index bee60e38..42ea2e3b 100644 --- a/programmer.c +++ b/programmer.c @@ -83,7 +83,8 @@ void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, int register_par_master(const struct par_master *mst, const enum chipbustype buses) { - struct registered_master rmst; + struct registered_master rmst = {0}; + if (!mst->chip_writeb || !mst->chip_writew || !mst->chip_writel || !mst->chip_writen || !mst->chip_readb || !mst->chip_readw || !mst->chip_readl || !mst->chip_readn) { diff --git a/programmer.h b/programmer.h index 29a100be..675a2594 100644 --- a/programmer.h +++ b/programmer.h @@ -749,7 +749,7 @@ struct par_master { int register_par_master(const struct par_master *mst, const enum chipbustype buses); struct registered_master { enum chipbustype buses_supported; - union { + struct { struct par_master par; struct spi_master spi; struct opaque_master opaque; @@ -133,7 +133,7 @@ int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start int register_spi_master(const struct spi_master *mst) { - struct registered_master rmst; + struct registered_master rmst = {0}; if (!mst->write_aai || !mst->write_256 || !mst->read || !mst->command || !mst->multicommand || |