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 --- buspirate_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'buspirate_spi.c') diff --git a/buspirate_spi.c b/buspirate_spi.c index 8aa72431b..8fa60f65c 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -332,7 +332,7 @@ static int buspirate_spi_init(const struct programmer_cfg *cfg) unsigned char *bp_commbuf; int bp_commbufsize; - dev = extract_programmer_param_str(NULL, "dev"); + dev = extract_programmer_param_str(cfg, "dev"); if (dev && !strlen(dev)) { free(dev); dev = NULL; @@ -342,7 +342,7 @@ static int buspirate_spi_init(const struct programmer_cfg *cfg) return 1; } - tmp = extract_programmer_param_str(NULL, "spispeed"); + tmp = extract_programmer_param_str(cfg, "spispeed"); if (tmp) { for (i = 0; spispeeds[i].name; i++) { if (!strncasecmp(spispeeds[i].name, tmp, strlen(spispeeds[i].name))) { @@ -356,7 +356,7 @@ static int buspirate_spi_init(const struct programmer_cfg *cfg) free(tmp); /* Extract serialspeed parameter */ - tmp = extract_programmer_param_str(NULL, "serialspeed"); + tmp = extract_programmer_param_str(cfg, "serialspeed"); if (tmp) { for (i = 0; serialspeeds[i].name; i++) { if (!strncasecmp(serialspeeds[i].name, tmp, strlen(serialspeeds[i].name))) { @@ -369,7 +369,7 @@ static int buspirate_spi_init(const struct programmer_cfg *cfg) } free(tmp); - tmp = extract_programmer_param_str(NULL, "pullups"); + tmp = extract_programmer_param_str(cfg, "pullups"); if (tmp) { if (strcasecmp("on", tmp) == 0) pullup = 1; @@ -380,7 +380,7 @@ static int buspirate_spi_init(const struct programmer_cfg *cfg) } free(tmp); - tmp = extract_programmer_param_str(NULL, "psus"); + tmp = extract_programmer_param_str(cfg, "psus"); if (tmp) { if (strcasecmp("on", tmp) == 0) psu = 1; -- cgit v1.2.3