mirror of
https://review.coreboot.org/flashrom.git
synced 2025-06-30 21:52:36 +02:00
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 <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:

committed by
Anastasia Klimchuk

parent
33af2e695d
commit
e316f1970d
@ -574,7 +574,7 @@ static int serprog_init(void)
|
||||
int have_device = 0;
|
||||
|
||||
/* the parameter is either of format "dev=/dev/device[:baud]" or "ip=ip:port" */
|
||||
device = extract_programmer_param_str("dev");
|
||||
device = extract_programmer_param_str(NULL, "dev");
|
||||
if (device && strlen(device)) {
|
||||
char *baud_str = strstr(device, ":");
|
||||
if (baud_str != NULL) {
|
||||
@ -611,7 +611,7 @@ static int serprog_init(void)
|
||||
}
|
||||
free(device);
|
||||
|
||||
device = extract_programmer_param_str("ip");
|
||||
device = extract_programmer_param_str(NULL, "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(void)
|
||||
spi_master_serprog.max_data_read = v;
|
||||
msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v);
|
||||
}
|
||||
spispeed = extract_programmer_param_str("spispeed");
|
||||
spispeed = extract_programmer_param_str(NULL, "spispeed");
|
||||
if (spispeed && strlen(spispeed)) {
|
||||
uint32_t f_spi_req, f_spi;
|
||||
uint8_t buf[4];
|
||||
|
Reference in New Issue
Block a user