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 --- internal.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'internal.c') diff --git a/internal.c b/internal.c index 8e267cdb..66eebdc9 100644 --- a/internal.c +++ b/internal.c @@ -116,7 +116,8 @@ static const struct par_master par_master_internal = { .chip_writen = fallback_chip_writen, }; -static int get_params(int *boardenable, int *boardmismatch, +static int get_params(const struct programmer_cfg *cfg, + int *boardenable, int *boardmismatch, int *force_laptop, int *not_a_laptop, char **board_vendor, char **board_model) { @@ -188,7 +189,7 @@ static int get_params(int *boardenable, int *boardmismatch, return 0; } -static int internal_init(void) +static int internal_init(const struct programmer_cfg *cfg) { int ret = 0; int force_laptop; @@ -200,7 +201,8 @@ static int internal_init(void) const char *cb_model = NULL; #endif - ret = get_params(&force_boardenable, &force_boardmismatch, + ret = get_params(cfg, + &force_boardenable, &force_boardmismatch, &force_laptop, ¬_a_laptop, &board_vendor, &board_model); if (ret) -- cgit v1.2.3