Use seconds for -T switch
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 20:37:53 +0000 (21:37 +0100)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 20:37:53 +0000 (21:37 +0100)
README.md
main.c

index 89a7a956708e8df91939abf33f759aa1bb4f8d17..3cde8b858d9aecf71811f96b522b35aa2a932919 100644 (file)
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ not support the NMRP protocol.
 
 After a successful file upload, `nmrpflash` waits for up to 60 seconds for an
 answer from your device. You can increase this by specifying a longer timeout
-using `-T` switch (argument is in milliseconds). 
+using `-T` switch (argument is in seconds).
 
 It's entirely possible that the image was flashed successfully, but the
 operation took longer than 60 seconds.
diff --git a/main.c b/main.c
index 8ce94ba482a4e3707b97b812412688d6ce5c2a2e..39fc226a1e91acc299d4b44966dcd07c9f8dee1c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@ void usage(FILE *fp)
                        " -m <mac>        MAC address of target device (xx:xx:xx:xx:xx:xx)\n"
                        " -M <netmask>    Subnet mask to assign to target device\n"
                        " -t <timeout>    Timeout (in milliseconds) for regular messages\n"
-                       " -T <timeout>    Time to wait after successfull TFTP upload\n"
+                       " -T <timeout>    Time (seconds) to wait after successfull TFTP upload\n"
                        " -p <port>       Port to use for TFTP upload\n"
 #ifdef NMRPFLASH_TFTP_TEST
                        " -U              Test TFTP upload\n"
@@ -124,7 +124,7 @@ int main(int argc, char **argv)
                                } else if (c == 't') {
                                        args.rx_timeout = val;
                                } else {
-                                       args.ul_timeout = val;
+                                       args.ul_timeout = val * 1000;
                                }
 
                                break;