[flashrom] [commit] r1908 - trunk
repository service
svn at flashrom.org
Mon Jan 4 04:05:24 CET 2016
Author: stefanct
Date: Mon Jan 4 04:05:23 2016
New Revision: 1908
URL: http://flashrom.org/trac/flashrom/changeset/1908
Log:
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/...".
Signed-off-by: Urja Rannikko <urjaman at gmail.com>
Acked-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Modified:
trunk/serprog.c
Modified: trunk/serprog.c
==============================================================================
--- trunk/serprog.c Mon Jan 4 04:05:15 2016 (r1907)
+++ trunk/serprog.c Mon Jan 4 04:05:23 2016 (r1908)
@@ -371,6 +371,8 @@
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 @@
}
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 @@
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;
More information about the flashrom
mailing list