Commit 27b431bc authored by Urja Rannikko's avatar Urja Rannikko Committed by Stefan Tauner
Browse files

serprog: fix missing device parameter error message on Windows


Previously, flashrom -p serprog didnt notice a completely missing dev=
string on Windows. Also, the error message shown if no device name
followed contained a misleading "/dev/...".

Corresponding to flashrom svn r1908.
Signed-off-by: default avatarUrja Rannikko <urjaman@gmail.com>
Acked-by: default avatarStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
parent 72587f85
......@@ -371,6 +371,8 @@ int serprog_init(void)
have_device++;
}
}
#if !IS_WINDOWS
if (device && !strlen(device)) {
msg_perr("Error: No device specified.\n"
"Use flashrom -p serprog:dev=/dev/device[:baud]\n");
......@@ -379,7 +381,6 @@ int serprog_init(void)
}
free(device);
#if !IS_WINDOWS
device = extract_programmer_param("ip");
if (have_device && device) {
msg_perr("Error: Both host and device specified.\n"
......@@ -415,15 +416,20 @@ int serprog_init(void)
free(device);
return 1;
}
#endif
free(device);
if (!have_device) {
#if IS_WINDOWS
msg_perr("Error: No device specified.\n"
"Use flashrom -p serprog:dev=comN[:baud]\n");
#else
msg_perr("Error: Neither host nor device specified.\n"
"Use flashrom -p serprog:dev=/dev/device:baud or "
"flashrom -p serprog:ip=ipaddr:port\n");
#endif
return 1;
}
#endif
if (register_shutdown(serprog_shutdown, NULL))
return 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment