diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-08-12 13:47:29 +1000 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2022-09-07 01:56:58 +0000 |
| commit | 5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b (patch) | |
| tree | f320b3bb2deace62c899f5015dbe348321ad7aad /ni845x_spi.c | |
| parent | c3df94cb96dd0a6771926e2c6a1ed6309452de83 (diff) | |
| download | flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.tar.gz flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.tar.bz2 flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.zip | |
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66656
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'ni845x_spi.c')
| -rw-r--r-- | ni845x_spi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ni845x_spi.c b/ni845x_spi.c index 0096307b8..3d74fd9ee 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -553,7 +553,7 @@ static int ni845x_spi_init(const struct programmer_cfg *cfg) int32 tmp = 0; // read the cs parameter (which Chip select should we use) - CS_str = extract_programmer_param_str(NULL, "cs"); + CS_str = extract_programmer_param_str(cfg, "cs"); if (CS_str) { CS_number = CS_str[0] - '0'; free(CS_str); @@ -563,7 +563,7 @@ static int ni845x_spi_init(const struct programmer_cfg *cfg) } } - voltage = extract_programmer_param_str(NULL, "voltage"); + voltage = extract_programmer_param_str(cfg, "voltage"); if (voltage != NULL) { requested_io_voltage_mV = parse_voltage(voltage); free(voltage); @@ -571,9 +571,9 @@ static int ni845x_spi_init(const struct programmer_cfg *cfg) return 1; } - serial_number = extract_programmer_param_str(NULL, "serial"); + serial_number = extract_programmer_param_str(cfg, "serial"); - speed_str = extract_programmer_param_str(NULL, "spispeed"); + speed_str = extract_programmer_param_str(cfg, "spispeed"); if (speed_str) { spi_speed_KHz = strtoul(speed_str, &endptr, 0); if (*endptr) { @@ -586,7 +586,7 @@ static int ni845x_spi_init(const struct programmer_cfg *cfg) } ignore_io_voltage_limits = false; - ignore_io_voltage_limits_str = extract_programmer_param_str(NULL, "ignore_io_voltage_limits"); + ignore_io_voltage_limits_str = extract_programmer_param_str(cfg, "ignore_io_voltage_limits"); if (ignore_io_voltage_limits_str && strcmp(ignore_io_voltage_limits_str, "yes") == 0) { ignore_io_voltage_limits = true; |