X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-eeprom%2Fao-eeprom.c;h=b865e298d2e01b6a499c6a7e270e46a682d31e2b;hp=399732d9f1fea9b9b7e230ac782c52943035d440;hb=84c93bb2fc4558a5e4654794ba90e730a84eaf67;hpb=9789ca5e8caa9a013e804f307b9da380e147bd75

diff --git a/ao-tools/ao-eeprom/ao-eeprom.c b/ao-tools/ao-eeprom/ao-eeprom.c
index 399732d9..b865e298 100644
--- a/ao-tools/ao-eeprom/ao-eeprom.c
+++ b/ao-tools/ao-eeprom/ao-eeprom.c
@@ -18,28 +18,65 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#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>] [--device <device-name>\n", program);
+	exit(1);
+}
+
 int
 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;
+	char		*tty = NULL;
+	char		*device = NULL;
+	int		c;
 
-	tty = getenv("CCDBG_TTY");
+	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);
-	for (block = 0; block < NUM_BLOCK; block++) {
+	if (!cc)
+		exit(1);
+	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);