X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-load%2Fao-load.c;h=4aa91b29d415c576803c9c3d563493c3a47a7f0a;hp=642af2fed7ada02beccf08c2fe4e1fe35c9b1e3a;hb=a55b132668a819cc26478a609cb79bd9190deb9d;hpb=b3b2d3c475a135084b5628c730fc6fca1ba0817b

diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index 642af2fe..4aa91b29 100644
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -22,20 +22,24 @@
 #include <unistd.h>
 #include <getopt.h>
 #include "ccdbg.h"
+#include "cc.h"
 
 #define AO_USB_DESC_STRING		3
 
 struct sym {
 	unsigned	addr;
 	char		*name;
-} serial_symbols[] = {
+} ao_symbols[] = {
 	{ 0,	"_ao_serial_number" },
-#define AO_SERIAL_NUMBER	(serial_symbols[0].addr)
+#define AO_SERIAL_NUMBER	(ao_symbols[0].addr)
 	{ 0,	"_ao_usb_descriptors" },
-#define AO_USB_DESCRIPTORS	(serial_symbols[1].addr)
+#define AO_USB_DESCRIPTORS	(ao_symbols[1].addr)
+	{ 0,	"_ao_radio_cal" },
+#define AO_RADIO_CAL		(ao_symbols[2].addr)
 };
 
-#define NUM_SERIAL_SYMBOLS	(sizeof(serial_symbols)/sizeof(serial_symbols[0]))
+#define NUM_SERIAL_SYMBOLS	2
+#define NUM_SYMBOLS		3
 
 static int
 find_symbols(FILE *map)
@@ -63,14 +67,14 @@ find_symbols(FILE *map)
 		a = strtoul(colon+1, &addr_end, 16);
 		if (a == ULONG_MAX || addr_end == addr)
 			continue;
-		for (s = 0; s < NUM_SERIAL_SYMBOLS; s++)
-			if (!strcmp(serial_symbols[s].name, name)) {
-				serial_symbols[s].addr = (unsigned) a;
+		for (s = 0; s < NUM_SYMBOLS; s++)
+			if (!strcmp(ao_symbols[s].name, name)) {
+				ao_symbols[s].addr = (unsigned) a;
 				++found;
 				break;
 			}
 	}
-	return found == NUM_SERIAL_SYMBOLS;
+	return found >= NUM_SERIAL_SYMBOLS;
 }
 
 static int
@@ -89,21 +93,19 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len)
 	memcpy(image->data + addr - image->address, data, len);
 }
 
-<<<<<<< HEAD:ao-tools/ao-load/ao-load.c
-static const struct option
-=======
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
+	{ .name = "device", .has_arg = 1, .val = 'D' },
+	{ .name = "cal", .has_arg = 1, .val = 'c' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--tty <tty-name>] file.ihx serial-number\n", program);
+	fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [--cal <radio-cal>] file.ihx serial-number\n", program);
 	exit(1);
 }
 
->>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c
 int
 main (int argc, char **argv)
 {
@@ -126,13 +128,25 @@ main (int argc, char **argv)
 	unsigned	usb_descriptors;
 	int		string_num;
 	char		*tty = NULL;
+	char		*device = NULL;
+	uint32_t	cal = 0;
+	char		cal_int[4];
+	char		*cal_end;
 	int		c;
 
-	while ((c = getopt_long(argc, argv, "T:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "T:D:c:", options, NULL)) != -1) {
 		switch (c) {
 		case 'T':
 			tty = optarg;
 			break;
+		case 'D':
+			device = optarg;
+			break;
+		case 'c':
+			cal = strtoul(optarg, &cal_end, 10);
+			if (cal_end == optarg || *cal_end != '\0')
+				usage(argv[0]);
+			break;
 		default:
 			usage(argv[0]);
 			break;
@@ -223,6 +237,22 @@ main (int argc, char **argv)
 	if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
 		usage(argv[0]);
 
+	if (cal) {
+		cal_int[0] = cal & 0xff;
+		cal_int[1] = (cal >> 8) & 0xff;
+		cal_int[2] = (cal >> 16) & 0xff;
+		cal_int[3] = (cal >> 24) & 0xff;
+		if (!AO_RADIO_CAL) {
+			fprintf(stderr, "Cannot find radio calibration location in image\n");
+			exit(1);
+		}
+		if (!rewrite(image, AO_RADIO_CAL, cal_int, sizeof (cal_int))) {
+			fprintf(stderr, "Cannot rewrite radio calibration at %04x\n", AO_RADIO_CAL);
+			exit(1);
+		}
+	}
+	if (!tty)
+		tty = cc_usbdevs_find_by_arg(device, "TIDongle");
 	dbg = ccdbg_open(tty);
 	if (!dbg)
 		exit (1);