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 --- dediprog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dediprog.c') diff --git a/dediprog.c b/dediprog.c index cd115056..f957be6d 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1087,7 +1087,7 @@ static int dediprog_init(const struct programmer_cfg *cfg) long target = FLASH_TYPE_APPLICATION_FLASH_1; int i, ret; - param_str = extract_programmer_param_str(NULL, "spispeed"); + param_str = extract_programmer_param_str(cfg, "spispeed"); if (param_str) { for (i = 0; spispeeds[i].name; ++i) { if (!strcasecmp(spispeeds[i].name, param_str)) { @@ -1103,7 +1103,7 @@ static int dediprog_init(const struct programmer_cfg *cfg) free(param_str); } - param_str = extract_programmer_param_str(NULL, "voltage"); + param_str = extract_programmer_param_str(cfg, "voltage"); if (param_str) { millivolt = parse_voltage(param_str); free(param_str); @@ -1112,7 +1112,7 @@ static int dediprog_init(const struct programmer_cfg *cfg) msg_pinfo("Setting voltage to %i mV\n", millivolt); } - param_str = extract_programmer_param_str(NULL, "id"); + param_str = extract_programmer_param_str(cfg, "id"); if (param_str) { char prefix0, prefix1; if (sscanf(param_str, "%c%c%d", &prefix0, &prefix1, &id) != 3) { @@ -1135,7 +1135,7 @@ static int dediprog_init(const struct programmer_cfg *cfg) } free(param_str); - param_str = extract_programmer_param_str(NULL, "device"); + param_str = extract_programmer_param_str(cfg, "device"); if (param_str) { char *dev_suffix; if (id != -1) { @@ -1162,7 +1162,7 @@ static int dediprog_init(const struct programmer_cfg *cfg) } free(param_str); - param_str = extract_programmer_param_str(NULL, "target"); + param_str = extract_programmer_param_str(cfg, "target"); if (param_str) { char *target_suffix; errno = 0; -- cgit v1.2.3