altosui: Support 32-bit ihx files

[fw/altos] / src / stm-flash / ao_stm_flash.c

diff --git a/src/stm-flash/ao_stm_flash.c b/src/stm-flash/ao_stm_flash.c
index 617c6d79ea1ab26434cc9777e833e46a24cb2894..a70db48aa107e9c16bdf2f2b628d881dabab8a83 100644 (file)
--- a/src/stm-flash/ao_stm_flash.c
+++ b/src/stm-flash/ao_stm_flash.c
@@ -17,36 +17,146 @@
 
 #include "ao.h"
 #include <ao_exti.h>
+#include <ao_boot.h>
+#include <ao_flash_stm.h>
 
 void
-ao_panic(uint8_t c)
+ao_panic(uint8_t reason)
 {
+       for (;;);
 }
 
 void
-ao_test(void)
+ao_application(void)
 {
-       char    c;
+       ao_boot_reboot(AO_BOOT_APPLICATION_BASE);
+}
+
+static uint32_t
+ao_cmd_hex32(void)
+{
+       __pdata uint8_t r = ao_cmd_lex_error;
+       int8_t  n;
+       uint32_t v = 0;
+
+       ao_cmd_white();
+       for(;;) {
+               n = ao_cmd_hexchar(ao_cmd_lex_c);
+               if (n < 0)
+                       break;
+               v = (v << 4) | n;
+               r = ao_cmd_success;
+               ao_cmd_lex();
+       }
+       if (r != ao_cmd_success)
+               ao_cmd_status = r;
+       return v;
+}
+
+void
+ao_block_erase(void)
+{
+       uint32_t        addr = ao_cmd_hex32();
+       uint32_t        *p = (uint32_t *) addr;
+
+       ao_flash_erase_page(p);
+}
+
+void
+ao_block_write(void)
+{
+       uint32_t        addr = ao_cmd_hex32();
+       uint32_t        *p = (uint32_t *) addr;
+       union {
+               uint8_t         data8[256];
+               uint32_t        data32[64];
+       } u;
+       uint16_t        i;
+
+       if (addr < 0x08002000 || 0x08200000 <= addr) {
+               ao_put_string("Invalid address\n");
+               return;
+       }
+       for (i = 0; i < 256; i++)
+               u.data8[i] = getchar();
+       ao_flash_page(p, u.data32);
+}
 
-       for (;;) {
-               c = ao_usb_getchar();
-               ao_usb_putchar(c);
-               ao_usb_flush();
+static void
+puthex(uint8_t c)
+{
+       c &= 0xf;
+       if (c < 10)
+               c += '0';
+       else
+               c += 'a' - 10;
+       putchar (c);
+}
+
+void
+ao_block_read(void)
+{
+       uint32_t        addr = ao_cmd_hex32();
+       uint8_t         *p = (uint8_t *) addr;
+       uint16_t        i;
+       uint8_t         c;
+
+       for (i = 0; i < 256; i++) {
+               c = *p++;
+               (*ao_stdios[ao_cur_stdio].putchar)(c);
        }
 }
 
-struct ao_task ao_test_task;
+void
+ao_block_read_hex(void)
+{
+       uint32_t        addr = ao_cmd_hex32();
+       uint8_t         *p = (uint8_t *) addr;
+       uint16_t        i;
+       uint8_t         c;
+
+       for (i = 0; i < 256; i++) {
+               c = *p++;
+               puthex(c>>4);
+               puthex(c);
+               if ((i & 0xf) == 0xf)
+                       putchar('\n');
+       }
+}
+
+static void
+ao_show_version(void)
+{
+       puts("altos-loader");
+       ao_put_string("manufacturer     "); puts(ao_manufacturer);
+       ao_put_string("product          "); puts(ao_product);
+       ao_put_string("software-version "); puts(ao_version);
+}
+
+__code struct ao_cmds ao_flash_cmds[] = {
+       { ao_show_version, "v\0Version" },
+       { ao_application, "a\0Switch to application" },
+       { ao_block_erase, "X <addr>\0Erase block." },
+       { ao_block_write, "W <addr>\0Write block. 256 binary bytes follow newline" },
+       { ao_block_read, "R <addr>\0Read block. Returns 256 binary bytes" },
+       { ao_block_read_hex, "H <addr>\0Hex read block. Returns 256 bytes in hex" },
+       { 0, NULL },
+};
 
 int
 main(void)
 {
        ao_clock_init();
+
+       ao_task_init();
+
        ao_timer_init();
 //     ao_dma_init();
        ao_cmd_init();
 //     ao_exti_init();
        ao_usb_init();
 
+       ao_cmd_register(&ao_flash_cmds[0]);
        ao_start_scheduler();
        return 0;
 }