diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-08-12 12:56:43 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-08-25 00:29:00 +0000 |
| commit | 8f9e910eb342799c582ee2c9569ffb4be6296719 (patch) | |
| tree | ad485edfa2df067c0eae7fbe7c4f6901eee86cd9 /include | |
| parent | 16744f9e96d0f1e203d4a67ad2bfd0c50e3c437a (diff) | |
| download | flashrom-8f9e910eb342799c582ee2c9569ffb4be6296719.tar.gz flashrom-8f9e910eb342799c582ee2c9569ffb4be6296719.tar.bz2 flashrom-8f9e910eb342799c582ee2c9569ffb4be6296719.zip | |
parallel.c: Consoldiate parallel master registration logic
This is analogous to spi.c and opaque.c however parallel
logic was previously never consoldiated.
This free's up flashrom.c from namespace pollution.
BUG=b:242246291
TEST=builds with both make and meson.
Change-Id: Ie08e2e6c51ccef5281386bf7e3df439b91573974
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66651
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/flash.h | 1 | ||||
| -rw-r--r-- | include/programmer.h | 20 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/flash.h b/include/flash.h index a1b83dab..79aaa64a 100644 --- a/include/flash.h +++ b/include/flash.h @@ -372,6 +372,7 @@ struct flashrom_flashctx { extern const struct flashchip flashchips[]; extern const unsigned int flashchips_size; +/* parallel.c */ void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); diff --git a/include/programmer.h b/include/programmer.h index b7b128f3..f5ce5566 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -417,15 +417,7 @@ struct opaque_master { }; int register_opaque_master(const struct opaque_master *mst, void *data); -/* programmer.c */ -void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len); -void fallback_unmap(void *virt_addr, size_t len); -void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); -void fallback_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); -uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr); -uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr); -void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); +/* parallel.c */ struct par_master { void (*chip_writeb) (const struct flashctx *flash, uint8_t val, chipaddr addr); void (*chip_writew) (const struct flashctx *flash, uint16_t val, chipaddr addr); @@ -439,6 +431,16 @@ struct par_master { void *data; }; int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data); + +/* programmer.c */ +void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len); +void fallback_unmap(void *virt_addr, size_t len); +void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); +void fallback_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); +void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); +uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr); +uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr); +void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); struct registered_master { enum chipbustype buses_supported; struct { |