From 5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 13:47:29 +1000 Subject: tree: Port programmers to pass programmer_cfg to extractors Ran; ``` $ find -name '*.c' -exec sed -i 's/extract_programmer_param_str(NULL/extract_programmer_param_str(cfg/g' '{}' \; ``` Manually fix i2c_helper_linux.c and other cases after. Treat cases of; - pcidev.c , and - usb_device.c as exceptional to be dealt with in later patches. Change-Id: If7b7987e803d35582dda219652a6fc3ed5729b47 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66656 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk Reviewed-by: Felix Singer --- internal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal.c') diff --git a/internal.c b/internal.c index 8b97f53d..18ac088a 100644 --- a/internal.c +++ b/internal.c @@ -129,7 +129,7 @@ static int get_params(const struct programmer_cfg *cfg, *board_vendor = NULL; *board_model = NULL; - arg = extract_programmer_param_str(NULL, "boardenable"); + arg = extract_programmer_param_str(cfg, "boardenable"); if (arg && !strcmp(arg,"force")) { *boardenable = 1; } else if (arg && !strlen(arg)) { @@ -143,7 +143,7 @@ static int get_params(const struct programmer_cfg *cfg, } free(arg); - arg = extract_programmer_param_str(NULL, "boardmismatch"); + arg = extract_programmer_param_str(cfg, "boardmismatch"); if (arg && !strcmp(arg,"force")) { *boardmismatch = 1; } else if (arg && !strlen(arg)) { @@ -157,7 +157,7 @@ static int get_params(const struct programmer_cfg *cfg, } free(arg); - arg = extract_programmer_param_str(NULL, "laptop"); + arg = extract_programmer_param_str(cfg, "laptop"); if (arg && !strcmp(arg, "force_I_want_a_brick")) *force_laptop = 1; else if (arg && !strcmp(arg, "this_is_not_a_laptop")) @@ -173,7 +173,7 @@ static int get_params(const struct programmer_cfg *cfg, } free(arg); - arg = extract_programmer_param_str(NULL, "mainboard"); + arg = extract_programmer_param_str(cfg, "mainboard"); if (arg && strlen(arg)) { if (board_parse_parameter(arg, board_vendor, board_model)) { free(arg); -- cgit v1.2.3