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 --- jlink_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jlink_spi.c') diff --git a/jlink_spi.c b/jlink_spi.c index 48239f3b..52fc7862 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -203,7 +203,7 @@ static int jlink_spi_init(const struct programmer_cfg *cfg) struct jlink_spi_data *jlink_data = NULL; bool enable_target_power; - arg = extract_programmer_param_str(NULL, "spispeed"); + arg = extract_programmer_param_str(cfg, "spispeed"); if (arg) { char *endptr; @@ -230,7 +230,7 @@ static int jlink_spi_init(const struct programmer_cfg *cfg) bool use_serial_number; uint32_t serial_number; - arg = extract_programmer_param_str(NULL, "serial"); + arg = extract_programmer_param_str(cfg, "serial"); if (arg) { if (!strlen(arg)) { @@ -259,7 +259,7 @@ static int jlink_spi_init(const struct programmer_cfg *cfg) free(arg); reset_cs = true; - arg = extract_programmer_param_str(NULL, "cs"); + arg = extract_programmer_param_str(cfg, "cs"); if (arg) { if (!strcasecmp(arg, "reset")) { @@ -281,7 +281,7 @@ static int jlink_spi_init(const struct programmer_cfg *cfg) msg_pdbg("Using TRST as chip select signal.\n"); enable_target_power = false; - arg = extract_programmer_param_str(NULL, "power"); + arg = extract_programmer_param_str(cfg, "power"); if (arg) { if (!strcasecmp(arg, "on")) { -- cgit v1.2.3