From 1233e638336f2d67be57b31bb769aa85aa5bd583 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 13:37:13 +1000 Subject: tree: Allow passing programmer_cfg directly to programmer Modify the type signature of each programmer entry-point xxx_init() functions to allow for the consumption of the programmer parameterisation string data. ``` $ find -name '*.c' -exec sed -i 's/_init(void)/_init(const char *prog_param)/g' '{}' \; $ find -name '*.c' -exec sed -i 's/get_params(/get_params(const char *prog_param, /g' '{}' \; $ find -name '*.c' -exec sed -i 's/const char \*prog_param)/const struct programmer_cfg *cfg)/g' '{}' \; $ find -name '*.c' -exec sed -i 's/const char \*prog_param,/const struct programmer_cfg *cfg,/g' '{}' \; ``` and manually fix up any remaining parts. Change-Id: I8bab51a635b9d3a43e1619a7a32b334f4ce2cdd2 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66655 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk Reviewed-by: Felix Singer --- pony_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pony_spi.c') diff --git a/pony_spi.c b/pony_spi.c index 50f44da7f..69be3aa04 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -120,7 +120,7 @@ static int pony_spi_shutdown(void *data) return ret; } -static int get_params(enum pony_type *type, int *have_device) +static int get_params(const struct programmer_cfg *cfg, enum pony_type *type, int *have_device) { char *arg = NULL; int ret = 0; @@ -159,7 +159,7 @@ static int get_params(enum pony_type *type, int *have_device) return ret; } -static int pony_spi_init(void) +static int pony_spi_init(const struct programmer_cfg *cfg) { int i, data_out; enum pony_type type; @@ -167,7 +167,7 @@ static int pony_spi_init(void) int have_device; int have_prog = 0; - if (get_params(&type, &have_device)) { + if (get_params(cfg, &type, &have_device)) { serialport_shutdown(NULL); return 1; } -- cgit v1.2.3