X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Fao-stmload%2Fao-stmload.c;h=6e3906fd691a1f40f10e29ffdddd4a02254c58db;hb=95a8180f3d7929dbad65c80421f99c925f245af0;hp=130f8707c75da8a0cb5c30952439c050d9403cf0;hpb=9ae987073f90402821120dbe962fceb4fc9f5435;p=fw%2Faltos

diff --git a/ao-tools/ao-stmload/ao-stmload.c b/ao-tools/ao-stmload/ao-stmload.c
index 130f8707..6e3906fd 100644
--- a/ao-tools/ao-stmload/ao-stmload.c
+++ b/ao-tools/ao-stmload/ao-stmload.c
@@ -34,7 +34,7 @@
 
 #define AO_USB_DESC_STRING		3
 
-struct sym ao_symbols[] = {
+struct ao_elf_sym ao_symbols[] = {
 
 	{ 0, AO_BOOT_APPLICATION_BASE + 0x100,	"ao_romconfig_version",	1 },
 #define AO_ROMCONFIG_VERSION	(ao_symbols[0].addr)
@@ -62,7 +62,7 @@ int ao_num_required_symbols = NUM_REQUIRED_SYMBOLS;
  * Edit the to-be-written memory block
  */
 static int
-rewrite(struct hex_image *load, unsigned address, uint8_t *data, int length)
+rewrite(struct ao_hex_image *load, unsigned address, uint8_t *data, int length)
 {
 	int 		i;
 
@@ -86,7 +86,7 @@ rewrite(struct hex_image *load, unsigned address, uint8_t *data, int length)
 static uint16_t
 get_uint16_cc(struct cc_usb *cc, uint32_t addr)
 {
-	struct hex_image	*hex = ao_self_read(cc, addr, 2);
+	struct ao_hex_image	*hex = ao_self_read(cc, addr, 2);
 	uint16_t		v;
 	uint8_t			*data;
 
@@ -101,7 +101,7 @@ get_uint16_cc(struct cc_usb *cc, uint32_t addr)
 static uint32_t
 get_uint32_cc(struct cc_usb *cc, uint32_t addr)
 {
-	struct hex_image	*hex = ao_self_read(cc, addr, 4);
+	struct ao_hex_image	*hex = ao_self_read(cc, addr, 4);
 	uint32_t		v;
 	uint8_t			*data;
 
@@ -224,12 +224,13 @@ static const struct option options[] = {
 	{ .name = "device", .has_arg = 1, .val = 'D' },
 	{ .name = "cal", .has_arg = 1, .val = 'c' },
 	{ .name = "serial", .has_arg = 1, .val = 's' },
+	{ .name = "verbose", .has_arg = 0, .val = 'v' },
 	{ 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-	fprintf(stderr, "usage: %s [--stlink] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
+	fprintf(stderr, "usage: %s [--stlink] [--verbose] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
 	exit(1);
 }
 
@@ -280,14 +281,15 @@ main (int argc, char **argv)
 	int			c;
 	stlink_t		*sl = NULL;
 	int			was_flashed = 0;
-	struct hex_image	*load;
+	struct ao_hex_image	*load;
 	int			tries;
 	struct cc_usb		*cc = NULL;
 	int			use_stlink = 0;
 	char			*tty = NULL;
 	int			success;
+	int			verbose = 0;
 
-	while ((c = getopt_long(argc, argv, "T:D:c:s:S", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "T:D:c:s:Sv", options, NULL)) != -1) {
 		switch (c) {
 		case 'T':
 			tty = optarg;
@@ -308,21 +310,29 @@ main (int argc, char **argv)
 		case 'S':
 			use_stlink = 1;
 			break;
+		case 'v':
+			verbose++;
+			break;
 		default:
 			usage(argv[0]);
 			break;
 		}
 	}
 
+	ao_self_verbose = verbose;
+
+	if (verbose > 1)
+		ccdbg_add_debug(CC_DEBUG_BITBANG);
+
 	filename = argv[optind];
 	if (filename == NULL)
 		usage(argv[0]);
 
 	if (ends_with (filename, ".elf")) {
-		load = ao_load_elf(filename);
+		load = ao_load_elf(filename, ao_symbols, ao_num_symbols);
 	} else if (ends_with (filename, ".ihx")) {
 		int	i;
-		load = ccdbg_hex_load(filename);
+		load = ao_hex_load(filename);
 		for (i = 0; i < ao_num_symbols; i++)
 			ao_symbols[i].addr = ao_symbols[i].default_addr;
 	} else
@@ -412,6 +422,7 @@ main (int argc, char **argv)
 			fprintf(stderr, "Cannot switch to boot loader\n");
 			exit(1);
 		}
+#if 0
 		{
 			uint8_t	check[256];
 			int	i = 0;
@@ -433,6 +444,7 @@ main (int argc, char **argv)
 				}
 			}
 		}
+#endif
 	}
 
 	/* Go fetch existing config values