X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-rawload%2Fao-rawload.c;h=a4746b195411ac8d73bb237774f12cea3020b808;hp=5f7708fd2f8c93ac4b1d8da40fefc0baaa71b2ca;hb=5d7a3a5fbc0af4621c67a6fd51a9c9d5ae688fa5;hpb=7c790fe859dff062692964338091ffbbcdf63257

diff --git a/ao-tools/ao-rawload/ao-rawload.c b/ao-tools/ao-rawload/ao-rawload.c
index 5f7708fd..a4746b19 100644
--- a/ao-tools/ao-rawload/ao-rawload.c
+++ b/ao-tools/ao-rawload/ao-rawload.c
@@ -16,7 +16,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#include <unistd.h>
+#include <getopt.h>
 #include "ccdbg.h"
+#include "cc.h"
+
+static const struct option options[] = {
+	{ .name = "tty", .has_arg = 1, .val = 'T' },
+	{ .name = "device", .has_arg = 1, .val = 'D' },
+	{ .name = "run", .has_arg = 0, .val = 'r' },
+	{ 0, 0, 0, 0},
+};
+
+static void usage(char *program)
+{
+	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [--run] file.ihx\n", program);
+	exit(1);
+}
 
 int
 main (int argc, char **argv)
@@ -26,12 +42,32 @@ main (int argc, char **argv)
 	uint16_t	pc;
 	struct hex_file	*hex;
 	struct hex_image *image;
-	char *filename;
-	FILE *file;
+	char		*filename;
+	FILE		*file;
+	char		*tty = NULL;
+	char		*device = NULL;
+	int		c;
+	int		run = 0;
 
-	filename = argv[1];
+	while ((c = getopt_long(argc, argv, "rT:D:", options, NULL)) != -1) {
+		switch (c) {
+		case 'T':
+			tty = optarg;
+			break;
+		case 'D':
+			device = optarg;
+			break;
+		case 'r':
+			run = 1;
+			break;
+		default:
+			usage(argv[0]);
+			break;
+		}
+	}
+	filename = argv[optind];
 	if (filename == NULL) {
-		fprintf(stderr, "usage: %s <filename.ihx>\n", argv[0]);
+		usage(argv[0]);
 		exit(1);
 	}
 	file = fopen(filename, "r");
@@ -50,7 +86,9 @@ main (int argc, char **argv)
 	}
 
 	ccdbg_hex_file_free(hex);
-	dbg = ccdbg_open();
+	if (!tty)
+		tty = cc_usbdevs_find_by_arg(device, "TIDongle");
+	dbg = ccdbg_open(tty);
 	if (!dbg)
 		exit (1);
 
@@ -73,8 +111,10 @@ main (int argc, char **argv)
 		ccdbg_close(dbg);
 		exit(1);
 	}
-	ccdbg_set_pc(dbg, image->address);
-	ccdbg_resume(dbg);
+	if (run) {
+		ccdbg_set_pc(dbg, image->address);
+		ccdbg_resume(dbg);
+	}
 	ccdbg_close(dbg);
 	exit (0);
 }