From e316f1970d9c51ab167be0835a4cfbadf92e9653 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 13:28:46 +1000 Subject: tree: Change signature of extract_programmer_param_str() Results can be reproduced with the following invocation; ``` $ find -name '*.c' -exec sed -i 's/extract_programmer_param_str(/extract_programmer_param_str(NULL, /g' '{}' \; ``` This allows for a pointer to the actual programmer parameters to be passed instead of a global. Change-Id: I781a328fa280e0a9601050dd99a75af72c39c899 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66654 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Anastasia Klimchuk --- ni845x_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ni845x_spi.c') diff --git a/ni845x_spi.c b/ni845x_spi.c index 14bebce8f..f75c3991a 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -553,7 +553,7 @@ static int ni845x_spi_init(void) int32 tmp = 0; // read the cs parameter (which Chip select should we use) - CS_str = extract_programmer_param_str("cs"); + CS_str = extract_programmer_param_str(NULL, "cs"); if (CS_str) { CS_number = CS_str[0] - '0'; free(CS_str); @@ -563,7 +563,7 @@ static int ni845x_spi_init(void) } } - voltage = extract_programmer_param_str("voltage"); + voltage = extract_programmer_param_str(NULL, "voltage"); if (voltage != NULL) { requested_io_voltage_mV = parse_voltage(voltage); free(voltage); @@ -571,9 +571,9 @@ static int ni845x_spi_init(void) return 1; } - serial_number = extract_programmer_param_str("serial"); + serial_number = extract_programmer_param_str(NULL, "serial"); - speed_str = extract_programmer_param_str("spispeed"); + speed_str = extract_programmer_param_str(NULL, "spispeed"); if (speed_str) { spi_speed_KHz = strtoul(speed_str, &endptr, 0); if (*endptr) { @@ -586,7 +586,7 @@ static int ni845x_spi_init(void) } ignore_io_voltage_limits = false; - ignore_io_voltage_limits_str = extract_programmer_param_str("ignore_io_voltage_limits"); + ignore_io_voltage_limits_str = extract_programmer_param_str(NULL, "ignore_io_voltage_limits"); if (ignore_io_voltage_limits_str && strcmp(ignore_io_voltage_limits_str, "yes") == 0) { ignore_io_voltage_limits = true; -- cgit v1.2.3