openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 06:23:18 +02:00
Code Issues Releases Wiki Activity

tree: Port programmers to pass programmer_cfg to extractors

Browse Source 
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>
This commit is contained in:
Edward O'Callaghan
2022-08-12 13:47:29 +10:00
committed by Anastasia Klimchuk
parent c3df94cb96
commit 5c710ea54a
30 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dediprog.c
View File

@ -1087,7 +1087,7 @@ static int dediprog_init(const struct programmer_cfg *cfg)
long target = FLASH_TYPE_APPLICATION_FLASH_1;
int i, ret;
param_str = extract_programmer_param_str(NULL, "spispeed");
param_str = extract_programmer_param_str(cfg, "spispeed");
if (param_str) {
for (i = 0; spispeeds[i].name; ++i) {
if (!strcasecmp(spispeeds[i].name, param_str)) {
@ -1103,7 +1103,7 @@ static int dediprog_init(const struct programmer_cfg *cfg)
free(param_str);
}
param_str = extract_programmer_param_str(NULL, "voltage");
param_str = extract_programmer_param_str(cfg, "voltage");
if (param_str) {
millivolt = parse_voltage(param_str);
free(param_str);
@ -1112,7 +1112,7 @@ static int dediprog_init(const struct programmer_cfg *cfg)
msg_pinfo("Setting voltage to %i mV\n", millivolt);
}
param_str = extract_programmer_param_str(NULL, "id");
param_str = extract_programmer_param_str(cfg, "id");
if (param_str) {
char prefix0, prefix1;
if (sscanf(param_str, "%c%c%d", &prefix0, &prefix1, &id) != 3) {
@ -1135,7 +1135,7 @@ static int dediprog_init(const struct programmer_cfg *cfg)
}
free(param_str);
param_str = extract_programmer_param_str(NULL, "device");
param_str = extract_programmer_param_str(cfg, "device");
if (param_str) {
char *dev_suffix;
if (id != -1) {
@ -1162,7 +1162,7 @@ static int dediprog_init(const struct programmer_cfg *cfg)
}
free(param_str);
param_str = extract_programmer_param_str(NULL, "target");
param_str = extract_programmer_param_str(cfg, "target");
if (param_str) {
char *target_suffix;
errno = 0;