summaryrefslogtreecommitdiffstats
path: root/dediprog.c
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2022-10-17 12:31:59 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2022-12-12 00:02:26 +0000
commit1e01eefcba573c436d55b863c7972b3029564215 (patch)
treeaa8850783eb557f4921020e8171fbd7c3ea1ade3 /dediprog.c
parent78e421bdf73d5739daa25a9f71b2c323dc98e840 (diff)
downloadflashrom-1e01eefcba573c436d55b863c7972b3029564215.tar.gz
flashrom-1e01eefcba573c436d55b863c7972b3029564215.tar.bz2
flashrom-1e01eefcba573c436d55b863c7972b3029564215.zip
tree/: Replace NULL-case of programmer_delay() with internal_delay
Replace `programmer_delay(NULL, [..])` calls with direct `internal_delay([..])` dispatches explicitly. Custom driver delays remain hooked as well as core flashrom logic. The NULL base case of 'programmer_delay()' then becomes a condition to validate for layering violations or invalid flash contexts. Change-Id: I1da230804d5e8f47a6e281feb66f381514dc6861 Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68434 Reviewed-by: Anastasia Klimchuk <aklm@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'dediprog.c')
-rw-r--r--dediprog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dediprog.c b/dediprog.c
index b4279d8e6..6c41f2863 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -316,7 +316,7 @@ static int dediprog_set_spi_voltage(libusb_device_handle *dediprog_handle, int m
if (voltage_selector == 0) {
/* Wait some time as the original driver does. */
- programmer_delay(NULL, 200 * 1000);
+ internal_delay(200 * 1000);
}
ret = dediprog_write(dediprog_handle, CMD_SET_VCC, voltage_selector, 0, NULL, 0);
if (ret != 0x0) {
@@ -326,7 +326,7 @@ static int dediprog_set_spi_voltage(libusb_device_handle *dediprog_handle, int m
}
if (voltage_selector != 0) {
/* Wait some time as the original driver does. */
- programmer_delay(NULL, 200 * 1000);
+ internal_delay(200 * 1000);
}
return 0;
}