diff options
| author | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2016-01-04 03:05:23 +0000 |
|---|---|---|
| committer | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2016-01-04 03:05:23 +0000 |
| commit | 038d5a516751528e5f7c202815d4a5589798549b (patch) | |
| tree | cccdb3718ce2b2399efa0e011c6cca0ba41bc45e | |
| parent | f4f64922945a0e333f081718e57899772a73482f (diff) | |
| download | flashrom-038d5a516751528e5f7c202815d4a5589798549b.tar.gz | |
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@gmail.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1908 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | serprog.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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; |