altos: Add actual flashing functions to stm-flash app

[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 81ae86df2523acdd9b9bd7c44ea311b041d8d506..4a91ef1fa4a5e1d234b003ae464e85b8305f1cb8 100644 (file)
--- a/src/stm-flash/ao_stm_flash.c
+++ b/src/stm-flash/ao_stm_flash.c
@@ -17,7 +17,6 @@
 
 #include "ao.h"
 #include <ao_exti.h>
-<<<<<<< HEAD
 #include <ao_boot.h>
 #include <ao_flash_stm.h>
 
@@ -54,15 +53,6 @@ ao_cmd_hex32(void)
        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)
 {
@@ -74,92 +64,44 @@ ao_block_write(void)
        } u;
        uint16_t        i;
 
-       if (addr < 0x08002000 || 0x08200000 <= addr) {
-               puts("Invalid address");
-               return;
-       }
        for (i = 0; i < 256; i++)
-               u.data8[i] = i;
+               u.data8[i] = getchar();
        ao_flash_page(p, u.data32);
 }
 
-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++;
-               puthex(c);
-               puthex(c>>4);
-               if ((i & 0xf) == 0xf)
-                       putchar('\n');
-       }
+       for (i = 0; i < 256; i++)
+               putchar(*p++);
 }
 
 __code struct ao_cmds ao_flash_cmds[] = {
-       { ao_application, "a\0Switch to application" },
-       { ao_block_erase, "e <addr>\0Erase block." },
+       { ao_application, "A\0Switch to application" },
        { ao_block_write, "W <addr>\0Write block. 256 binary bytes follow newline" },
        { ao_block_read, "R <addr>\0Read block. Returns 256 bytes" },
        { 0, NULL },
 };
-=======
-
-void
-ao_panic(uint8_t c)
-{
-}
-
-void
-ao_test(void)
-{
-       char    c;
-
-       for (;;) {
-               c = ao_usb_getchar();
-               ao_usb_putchar(c);
-               ao_usb_flush();
-       }
-}
 
-struct ao_task ao_test_task;
->>>>>>> 5187bb4... Add STM self-flashing loader
 
 int
 main(void)
 {
        ao_clock_init();
-<<<<<<< HEAD
 
        ao_task_init();
 
-=======
->>>>>>> 5187bb4... Add STM self-flashing loader
        ao_timer_init();
 //     ao_dma_init();
        ao_cmd_init();
 //     ao_exti_init();
        ao_usb_init();
 
-<<<<<<< HEAD
        ao_cmd_register(&ao_flash_cmds[0]);
-=======
->>>>>>> 5187bb4... Add STM self-flashing loader
        ao_start_scheduler();
        return 0;
 }