From 5c69cde56114ec96310a27dca7e72617d15ba2bc Mon Sep 17 00:00:00 2001 From: Alexander Goncharov Date: Fri, 29 Jul 2022 09:05:14 +0300 Subject: tree: provide flashrom context into programmer_delay() Modify the `programmer_delay` function signature to allow passing the flashrom context. Programmers that depend on internal delay should provide NULL as a context. The use of this function parameter will be introduced in CB:67393. TOPIC=programmer_handle_global TEST=builds Change-Id: Ibb0bce26ce2052853ee52158d7ba742967a9e229 Signed-off-by: Alexander Goncharov Reviewed-on: https://review.coreboot.org/c/flashrom/+/66373 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Felix Singer --- s25f.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 's25f.c') diff --git a/s25f.c b/s25f.c index 1133ef87..605a5607 100644 --- a/s25f.c +++ b/s25f.c @@ -93,7 +93,7 @@ static int s25f_legacy_software_reset(const struct flashctx *flash) /* Allow time for reset command to execute. The datasheet specifies * Trph = 35us, double that to be safe. */ - programmer_delay(T_RPH * 2); + programmer_delay(flash, T_RPH * 2); return 0; } @@ -126,7 +126,7 @@ static int s25fs_software_reset(struct flashctx *flash) } /* Allow time for reset command to execute. Double tRPH to be safe. */ - programmer_delay(T_RPH * 2); + programmer_delay(flash, T_RPH * 2); return 0; } @@ -160,7 +160,7 @@ static int s25f_poll_status(const struct flashctx *flash) return -1; } - programmer_delay(1000 * 10); + programmer_delay(flash, 1000 * 10); } return 0; @@ -226,7 +226,7 @@ static int s25fs_write_cr(const struct flashctx *flash, return -1; } - programmer_delay(T_W); + programmer_delay(flash, T_W); return s25f_poll_status(flash); } @@ -299,7 +299,7 @@ int s25fs_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int return result; } - programmer_delay(S25FS_T_SE); + programmer_delay(flash, S25FS_T_SE); return s25f_poll_status(flash); } @@ -337,7 +337,7 @@ int s25fl_block_erase(struct flashctx *flash, unsigned int addr, unsigned int bl return result; } - programmer_delay(S25FL_T_SE); + programmer_delay(flash, S25FL_T_SE); return s25f_poll_status(flash); } -- cgit v1.2.3