aboutsummaryrefslogtreecommitdiffstats
path: root/serprog.c
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2022-08-12 13:28:46 +1000
committerAnastasia Klimchuk <aklm@chromium.org>2022-09-07 01:49:49 +0000
commite316f1970d9c51ab167be0835a4cfbadf92e9653 (patch)
tree3d021eb4f804b05ec57aad9c5e3cd46f1b7003b8 /serprog.c
parent33af2e695d28a89e0eaf9b058310bc5bf0e6e80f (diff)
downloadflashrom-e316f1970d9c51ab167be0835a4cfbadf92e9653.tar.gz
flashrom-e316f1970d9c51ab167be0835a4cfbadf92e9653.tar.bz2
flashrom-e316f1970d9c51ab167be0835a4cfbadf92e9653.zip
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>
Diffstat (limited to 'serprog.c')
-rw-r--r--serprog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/serprog.c b/serprog.c
index ca3a94e2..44802854 100644
--- a/serprog.c
+++ b/serprog.c
@@ -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];