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 /serprog.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 'serprog.c')
| -rw-r--r-- | serprog.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -574,7 +574,7 @@ static int serprog_init(const struct programmer_cfg *cfg) int have_device = 0; /* the parameter is either of format "dev=/dev/device[:baud]" or "ip=ip:port" */ - device = extract_programmer_param_str(NULL, "dev"); + device = extract_programmer_param_str(cfg, "dev"); if (device && strlen(device)) { char *baud_str = strstr(device, ":"); if (baud_str != NULL) { @@ -611,7 +611,7 @@ static int serprog_init(const struct programmer_cfg *cfg) } free(device); - device = extract_programmer_param_str(NULL, "ip"); + device = extract_programmer_param_str(cfg, "ip"); if (have_device && device) { msg_perr("Error: Both host and device specified.\n" "Please use either dev= or ip= but not both.\n"); @@ -739,7 +739,7 @@ static int serprog_init(const struct programmer_cfg *cfg) spi_master_serprog.max_data_read = v; msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v); } - spispeed = extract_programmer_param_str(NULL, "spispeed"); + spispeed = extract_programmer_param_str(cfg, "spispeed"); if (spispeed && strlen(spispeed)) { uint32_t f_spi_req, f_spi; uint8_t buf[4]; |