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

diff --git a/src/product/ao_flash_task.c b/src/product/ao_flash_task.c
index fdc4d0aa..9a12add6 100644
--- a/src/product/ao_flash_task.c
+++ b/src/product/ao_flash_task.c
@@ -24,6 +24,7 @@
 void
 ao_panic(uint8_t reason)
 {
+	(void) reason;
 }
 
 void
@@ -73,29 +74,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,18 +110,43 @@ 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("\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_string(ao_version);
 	ao_put_string("\n");
 }