X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Fao-usbload%2Fao-usbload.c;h=2f121cfe4fccf558d70f2e3c11bc0c7f05b2516a;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=fd34fbdcfad8f21f7c0443a89fe312f4c500527e;hpb=8124af8c27b2b9e446aa3a4f1da83d4db7c1ea87;p=fw%2Faltos

diff --git a/ao-tools/ao-usbload/ao-usbload.c b/ao-tools/ao-usbload/ao-usbload.c
index fd34fbdc..2f121cfe 100644
--- a/ao-tools/ao-usbload/ao-usbload.c
+++ b/ao-tools/ao-usbload/ao-usbload.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -86,12 +87,13 @@ static const struct option options[] = {
 	{ .name = "cal", .has_arg = 1, .val = 'c' },
 	{ .name = "serial", .has_arg = 1, .val = 's' },
 	{ .name = "verbose", .has_arg = 1, .val = 'v' },
+	{ .name = "wait", .has_arg = 0, .val = 'w' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--raw] [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
+	fprintf(stderr, "usage: %s [--raw] [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] [--wait] file.{elf,ihx}\n", program);
 	exit(1);
 }
 
@@ -145,7 +147,7 @@ main (int argc, char **argv)
 	uint32_t		flash_base, flash_bound;
 	int			has_flash_size = 0;
 
-	while ((c = getopt_long(argc, argv, "rT:D:c:s:v:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "wrT:D:c:s:v:", options, NULL)) != -1) {
 		switch (c) {
 		case 'T':
 			tty = optarg;
@@ -156,6 +158,9 @@ main (int argc, char **argv)
 		case 'r':
 			raw = 1;
 			break;
+		case 'w':
+			cc_default_timeout = -1;
+			break;
 		case 'c':
 			cal = strtoul(optarg, &cal_end, 10);
 			if (cal_end == optarg || *cal_end != '\0')
@@ -208,6 +213,10 @@ main (int argc, char **argv)
 				this_tty = cc_usbdevs_find_by_arg(device, "AltosFlash");
 			if (!this_tty)
 				this_tty = cc_usbdevs_find_by_arg(device, "TeleMega");
+			if (!this_tty)
+				this_tty = cc_usbdevs_find_by_arg(device, "TeleMetrum");
+			if (!this_tty)
+				this_tty = cc_usbdevs_find_by_arg(device, "TeleGPS");
 			if (!this_tty)
 				this_tty = getenv("ALTOS_TTY");
 			if (!this_tty)