openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

tree: Change signature of extract_programmer_param_str()

Browse Source 
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66654
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
Edward O'Callaghan
2022-08-12 13:28:46 +10:00
committed by Anastasia Klimchuk
parent 33af2e695d
commit e316f1970d
32 changed files with 88 additions and 83 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(void)
long target = FLASH_TYPE_APPLICATION_FLASH_1;
int i, ret;
param_str = extract_programmer_param_str("spispeed");
param_str = extract_programmer_param_str(NULL, "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(void)
free(param_str);
}
param_str = extract_programmer_param_str("voltage");
param_str = extract_programmer_param_str(NULL, "voltage");
if (param_str) {
millivolt = parse_voltage(param_str);
free(param_str);
@ -1112,7 +1112,7 @@ static int dediprog_init(void)
msg_pinfo("Setting voltage to %i mV\n", millivolt);
}
param_str = extract_programmer_param_str("id");
param_str = extract_programmer_param_str(NULL, "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(void)
}
free(param_str);
param_str = extract_programmer_param_str("device");
param_str = extract_programmer_param_str(NULL, "device");
if (param_str) {
char *dev_suffix;
if (id != -1) {
@ -1162,7 +1162,7 @@ static int dediprog_init(void)
}
free(param_str);
param_str = extract_programmer_param_str("target");
param_str = extract_programmer_param_str(NULL, "target");
if (param_str) {
char *target_suffix;
errno = 0;