X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fproduct%2Fao_flash_task.c;h=a1daf06a70f9da1514565e329cec8daa538aaaec;hb=HEAD;hp=fdc4d0aa5ad3b9bbd059adecc5c1476558892337;hpb=4a90eec4b8ee4a35711aa74c13b3f30d12c0fe08;p=fw%2Faltos

diff --git a/src/product/ao_flash_task.c b/src/product/ao_flash_task.c
index fdc4d0aa..a1daf06a 100644
--- a/src/product/ao_flash_task.c
+++ b/src/product/ao_flash_task.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,19 +25,30 @@
 void
 ao_panic(uint8_t reason)
 {
+	(void) reason;
+	for (;;);
 }
 
-void
-ao_put_string(__code char *s)
+static void
+ao_put_stringn(const char *s, int max)
 {
 	char	c;
-	while ((c = *s++)) {
+	while (max--) {
+		c = *s++;
+		if (!c)
+			break;
 		if (c == '\n')
 			ao_usb_putchar('\r');
 		ao_usb_putchar(c);
 	}
 }
 
+void
+ao_put_string(const char *s)
+{
+	ao_put_stringn(s, 65535);
+}
+
 static void
 ao_application(void)
 {
@@ -46,7 +58,7 @@ ao_application(void)
 static uint32_t
 ao_get_hex32(void)
 {
-	int8_t	n;
+	int	n;
 	uint32_t v = 0;
 
 	for (;;) {
@@ -63,7 +75,7 @@ ao_get_hex32(void)
 			n = n - ('A' - 10);
 		else
 			break;
-		v = (v << 4) | n;
+		v = (v << 4) | (uint8_t) n;
 		n = ao_usb_getchar();
 	}
 	return v;
@@ -73,29 +85,32 @@ static void
 ao_block_erase(void)
 {
 	uint32_t	addr = ao_get_hex32();
-	uint32_t	*p = (uint32_t *) addr;
+	void		*p = (void *) addr;
 
 	ao_flash_erase_page(p);
 }
 
+static int
+ao_block_valid_address(uint32_t addr)
+{
+	if ((uint32_t) AO_BOOT_APPLICATION_BASE <= addr && addr <= (uint32_t) AO_BOOT_APPLICATION_BOUND - 256)
+		return 1;
+	return 0;
+}
+
 static void
 ao_block_write(void)
 {
 	uint32_t	addr = ao_get_hex32();
-	uint32_t	*p = (uint32_t *) addr;
-	union {
-		uint8_t		data8[256];
-		uint32_t	data32[64];
-	} u;
+	void		*p = (void *) addr;
+	uint8_t		data[256];
 	uint16_t	i;
 
-	if (addr < (uint32_t) AO_BOOT_APPLICATION_BASE) {
-		ao_put_string("Invalid address\n");
-		return;
-	}
 	for (i = 0; i < 256; i++)
-		u.data8[i] = ao_usb_getchar();
-	ao_flash_page(p, u.data32);
+		data[i] = ao_usb_getchar();
+	if (!ao_block_valid_address(addr))
+		return;
+	ao_flash_page(p, (void *) data);
 }
 
 static void
@@ -106,19 +121,44 @@ ao_block_read(void)
 	uint16_t	i;
 	uint8_t		c;
 
+	if (!ao_block_valid_address(addr)) {
+		for (i = 0; i < 256; i++)
+			ao_usb_putchar(0xff);
+		return;
+	}
 	for (i = 0; i < 256; i++) {
 		c = *p++;
 		ao_usb_putchar(c);
 	}
 }
 
+static inline void
+hexchar(uint8_t c)
+{
+	if (c > 10)
+		c += 'a' - ('9' + 1);
+	ao_usb_putchar(c + '0');
+}
+
+static void
+ao_put_hex(uint32_t u)
+{
+	int8_t i;
+	for (i = 28; i >= 0; i -= 4)
+		hexchar((u >> i) & 0xf);
+}
+
 static void
 ao_show_version(void)
 {
 	ao_put_string("altos-loader");
 	ao_put_string("\nmanufacturer     "); ao_put_string(ao_manufacturer);
 	ao_put_string("\nproduct          "); ao_put_string(ao_product);
-	ao_put_string("\nsoftware-version "); ao_put_string(ao_version);
+	ao_put_string("\nflash-range      ");
+	ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BASE);
+	ao_usb_putchar(' ');
+	ao_put_hex((uint32_t) AO_BOOT_APPLICATION_BOUND);
+	ao_put_string("\nsoftware-version "); ao_put_stringn(ao_version, AO_MAX_VERSION);
 	ao_put_string("\n");
 }