A different way of storing the ROM image.

[uccvend-snackrom.git] / ROM2 / main_basic.c

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 1165326..8d86585 100644 (file)
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -324,6 +324,9 @@ void getrom() {
        send_string("Writing to serial port (maybe). Size is 0x");
        send_string(u82hex(_rom_src_len >> 8));
        send_string(u82hex(_rom_src_len & 0xff));
+       send_string("@0x");
+       send_string(u82hex((u16)(&_rom_src_data) >> 8));
+       send_string(u82hex((u16)(&_rom_src_data) & 0xff));
        send_string(" with signature ");
        s[0] = _rom_src_data[0];
        s[1] = _rom_src_data[1];
@@ -333,7 +336,10 @@ void getrom() {
        send_string(CRLF " Type YES to download rom.tar.bz2 via XMODEM: ");
        msg_clr();
        while (!sci_have_packet); /* spin */
-       if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) return;
+       if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) {
+               send_string(CRLF "Transfer cancelled." CRLF);
+               return;
+       }
 
        sci_init();
        sci_doing_xmodem = 1;
@@ -346,16 +352,19 @@ void getrom() {
        char *end = (char*)_rom_src_data+_rom_src_len;
        bool aborted = 0;
        while (1) {
-               if (!xmodem_send_packet((char*)p, 128)) {
-                       aborted = 1;
-                       break;
-               }
-               p += 128;
                if (p + 128 > end) {
                        /* send partial packet */
                        if (!xmodem_send_packet((char*)p, end-p)) aborted = 1;
                        break;
+               } if ((u16)p == 0xb600) {
+                       /* we have an eeprom here. skip it. */
+                       p += 0x0200;
+                       continue;
+               } else if (!xmodem_send_packet((char*)p, 128)) {
+                       aborted = 1;
+                       break;
                }
+               p += 128;
        }
 
        xmodem_finish_xfer();