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 --- realtek_mst_i2c_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'realtek_mst_i2c_spi.c') diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index c4482acf..74458c8e 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -450,7 +450,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter int ret = 0; *allow_brick = false; /* Default behaviour is to bail. */ - param_str = extract_programmer_param_str(NULL, "allow_brick"); + param_str = extract_programmer_param_str(cfg, "allow_brick"); if (param_str) { if (!strcmp(param_str, "yes")) { *allow_brick = true; @@ -462,7 +462,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter free(param_str); *reset = false; /* Default behaviour is no MCU reset on tear-down. */ - param_str = extract_programmer_param_str(NULL, "reset_mcu"); + param_str = extract_programmer_param_str(cfg, "reset_mcu"); if (param_str) { if (param_str[0] == '1') { *reset = true; @@ -476,7 +476,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter free(param_str); *enter_isp = true; /* Default behaviour is enter ISP on setup. */ - param_str = extract_programmer_param_str(NULL, "enter_isp"); + param_str = extract_programmer_param_str(cfg, "enter_isp"); if (param_str) { if (param_str[0] == '1') { *enter_isp = true; @@ -512,7 +512,7 @@ static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg) return SPI_GENERIC_ERROR; } - int fd = i2c_open_from_programmer_params(REGISTER_ADDRESS, 0); + int fd = i2c_open_from_programmer_params(cfg, REGISTER_ADDRESS, 0); if (fd < 0) return fd; -- cgit v1.2.1