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 --- raiden_debug_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'raiden_debug_spi.c') diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index d2eea6ad..2f073ae0 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1432,7 +1432,7 @@ static int configure_protocol(struct raiden_debug_spi_data *ctx_data) static int get_ap_request_type(const struct programmer_cfg *cfg) { int ap_request = RAIDEN_DEBUG_SPI_REQ_ENABLE_AP; - char *custom_rst_str = extract_programmer_param_str(NULL, "custom_rst"); + char *custom_rst_str = extract_programmer_param_str(cfg, "custom_rst"); if (custom_rst_str) { if (!strcasecmp(custom_rst_str, "true")) { ap_request = RAIDEN_DEBUG_SPI_REQ_ENABLE_AP_CUSTOM; @@ -1456,7 +1456,7 @@ static int get_target(const struct programmer_cfg *cfg) */ int request_enable = RAIDEN_DEBUG_SPI_REQ_ENABLE; - char *target_str = extract_programmer_param_str(NULL, "target"); + char *target_str = extract_programmer_param_str(cfg, "target"); if (target_str) { if (!strcasecmp(target_str, "ap")) request_enable = get_ap_request_type(cfg); @@ -1485,7 +1485,7 @@ static void free_dev_list(struct usb_device **dev_lst) static int raiden_debug_spi_init(const struct programmer_cfg *cfg) { struct usb_match match; - char *serial = extract_programmer_param_str(NULL, "serial"); + char *serial = extract_programmer_param_str(cfg, "serial"); struct usb_device *current; struct usb_device *device = NULL; int found = 0; -- cgit v1.2.3