X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fmain_basic.c;h=27d6e0bee9ddfb90af0faad6397dc422adce830d;hb=dc87be12e6cb8428ab33c0984c5f871e6e1c5587;hp=1165326b3e0693eaa7e0e89770491c35fd2b802c;hpb=b0e717fbd07189603c7fcc51f55bc6f67119ead3;p=uccvend-snackrom.git

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 1165326..27d6e0b 100644
--- 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();
@@ -397,7 +406,6 @@ int main() {
 
 	set_msg("  CRUEL   ");
 
-	//comm_init();
 	//coinmech_init();
 	sci_init();
 	keypad_init();