2 files changed, 39 insertions, 7 deletions

diff --git a/ao-tools/ao-eeprom/ao-eeprom.1 b/ao-tools/ao-eeprom/ao-eeprom.1
index 8caff9d1..ed498147 100644
--- a/ao-tools/ao-eeprom/ao-eeprom.1
+++ b/ao-tools/ao-eeprom/ao-eeprom.1
@@ -21,7 +21,31 @@
 ao-eeprom \- Fetch eeprom contents from TeleMetrum device
 .SH SYNOPSIS
 .B "ao-eeprom"
-[\-tty \fItty-device\fP]
+[\-T \fItty-device\fP]
+[\--tty \fItty-device\fP]
+[\-D \fIaltos-device\fP]
+[\--device \fIaltos-device\fP]
+.SH OPTIONS
+.TP
+\-T tty-device | --tty tty-device
+This selects which tty device the debugger uses to communicate with
+the target device. The special name 'BITBANG' directs ao-dbg to use
+the cp2103 connection, otherwise this should be a usb serial port
+connected to a suitable cc1111 debug node.
+.TP
+\-D AltOS-device | --device AltOS-device
+Search for a connected device. This requires an argument of one of the
+following forms:
+.IP
+TeleMetrum:2
+.br
+TeleMetrum
+.br
+2
+.IP
+Leaving out the product name will cause the tool to select a suitable
+product, leaving out the serial number will cause the tool to match
+one of the available devices.
 .SH DESCRIPTION
 .I ao-eeprom
 downloads the eeprom contents from a connected TeleMetrum device.
diff --git a/ao-tools/ao-eeprom/ao-eeprom.c b/ao-tools/ao-eeprom/ao-eeprom.c
index 726cc22c..b865e298 100644
--- a/ao-tools/ao-eeprom/ao-eeprom.c
+++ b/ao-tools/ao-eeprom/ao-eeprom.c
@@ -21,17 +21,19 @@
 #include <unistd.h>
 #include <getopt.h>
 #include "cc-usb.h"
+#include "cc.h"
 
 #define NUM_BLOCK	512
 
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
+	{ .name = "device", .has_arg = 1, .val = 'D' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--tty <tty-name>]\n", program);
+	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>\n", program);
 	exit(1);
 }
 
@@ -40,35 +42,41 @@ main (int argc, char **argv)
 {
 	struct cc_usb	*cc;
 	int		block;
-	uint8_t		bytes[32 * (2 + 8)];
+	uint8_t		bytes[2 * 32 * (2 + 8)];
 	uint8_t		*b;
 	int		i, j;
 	uint32_t	addr;
 	char		*tty = NULL;
+	char		*device = NULL;
 	int		c;
 
-	while ((c = getopt_long(argc, argv, "T:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "T:D:", options, NULL)) != -1) {
 		switch (c) {
 		case 'T':
 			tty = optarg;
 			break;
+		case 'D':
+			device = optarg;
+			break;
 		default:
 			usage(argv[0]);
 			break;
 		}
 	}
 	if (!tty)
+		tty = cc_usbdevs_find_by_arg(device, "TeleMetrum");
+	if (!tty)
 		tty = getenv("ALTOS_TTY");
 	if (!tty)
 		tty="/dev/ttyACM0";
 	cc = cc_usb_open(tty);
 	if (!cc)
 		exit(1);
-	for (block = 0; block < NUM_BLOCK; block++) {
+	for (block = 0; block < NUM_BLOCK; block += 2) {
 		cc_queue_read(cc, bytes, sizeof (bytes));
-		cc_usb_printf(cc, "e %x\n", block);
+		cc_usb_printf(cc, "e %x\ne %x\n", block, block + 1);
 		cc_usb_sync(cc);
-		for (i = 0; i < 32; i++) {
+		for (i = 0; i < 32 * 2; i++) {
 			b = bytes + (i * 10);
 			addr = block * 256 + i * 8;
 			printf ("%06x", addr);