diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-09-07 12:51:16 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-12-12 00:01:10 +0000 |
| commit | 78e421bdf73d5739daa25a9f71b2c323dc98e840 (patch) | |
| tree | 293a63c17096eb667bea701e332d6ed911e8d7d0 /flashrom.c | |
| parent | 048aab6d66c45423386d0216fd7bf445fbd1dc7f (diff) | |
| download | flashrom-78e421bdf73d5739daa25a9f71b2c323dc98e840.tar.gz flashrom-78e421bdf73d5739daa25a9f71b2c323dc98e840.tar.bz2 flashrom-78e421bdf73d5739daa25a9f71b2c323dc98e840.zip | |
tree/: Move programmer_delay() out of programmer state machine
Handle the special cases of both serprog and ch341a_spi.
Also rewrite programmer_delay() to handle the two base
cases of zero time and no valid flashctx yet before
handling per master branching.
Additionally, modify the custom delay function pointer
signature to allow closure over the flashctx. This allows
driver specific delay implementations to recover programmer
specific opaque data within their delay implementations.
Therefore programmer specific delay functions can avoid
programmer specific globals.
Change-Id: Id059abb58b31a066a408009073912da2b224d40c
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67393
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'flashrom.c')
| -rw-r--r-- | flashrom.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/flashrom.c b/flashrom.c index 9c22eb6e7..d0f0d2d44 100644 --- a/flashrom.c +++ b/flashrom.c @@ -256,12 +256,21 @@ static bool master_uses_physmap(const struct registered_master *mst) void programmer_delay(const struct flashctx *flash, unsigned int usecs) { - if (usecs > 0) { - if (programmer->delay) - programmer->delay(usecs); - else - internal_delay(usecs); + if (usecs == 0) + return; + + if (!flash) + return internal_delay(usecs); + + if (flash->mst->buses_supported & BUS_SPI) { + if (flash->mst->spi.delay) + return flash->mst->spi.delay(flash, usecs); + } else if (flash->mst->buses_supported & BUS_PARALLEL) { + if (flash->mst->par.delay) + return flash->mst->par.delay(flash, usecs); } + + return internal_delay(usecs); } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, |