From: [NTU] <nick@ucc.gu.uwa.edu.au>
Date: Mon, 6 Aug 2018 13:18:19 +0000 (+0800)
Subject: Change from bzip2 compression to lzip
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4d4b7a86f1663c70abdea9b195b0fd511894bf68;p=uccvend-snackrom.git

Change from bzip2 compression to lzip
---

diff --git a/ROM2/Makefile b/ROM2/Makefile
index 11242d5..a832263 100644
--- a/ROM2/Makefile
+++ b/ROM2/Makefile
@@ -43,7 +43,7 @@ rom2.elf: $(OBJS) memory.x check-romsrc.pl
 	@perl -w check-romsrc.pl
 
 clean:
-	rm -f *.o *.elf *.s19 *.b *.a rom.tar.bz2 romsrc.s crctab.h version.h m68hc11-gdb gencrctab crctest
+	rm -f *.o *.elf *.s19 *.b *.a rom.tar.lz romsrc.s crctab.h version.h m68hc11-gdb gencrctab crctest
 
 crctest: crctest.c crctab.h
 	gcc -o $@ $<
@@ -57,11 +57,11 @@ dump:	rom2.elf
 size:   rom2.s19
 	$(SIZE) $<
 
-rom.tar.bz2:
+rom.tar.lz:
 	rm -f romsrc.s crctab.h
-	tar c README Makefile gdbsimrc *.pl *.c *.h *.s *.x | bzip2 -c -9 > $@
+	tar c README Makefile gdbsimrc *.pl *.c *.h *.s *.x | lzip -c -9 > $@
 
-romsrc.s: rom.tar.bz2 src2asm.pl
+romsrc.s: rom.tar.lz src2asm.pl
 	perl -w src2asm.pl < $< > $@
 
 main_basic.c: version.h
diff --git a/ROM2/check-romsrc.pl b/ROM2/check-romsrc.pl
index cf74d0e..7c0bab2 100644
--- a/ROM2/check-romsrc.pl
+++ b/ROM2/check-romsrc.pl
@@ -9,7 +9,7 @@ while (<OD>) {
 }
 close OD;
 if (!defined $origin) {
-	print "WARNING!!! No bz2 data could be found in the ROM image!\n";
+	print "WARNING!!! No lzip data could be found in the ROM image!\n";
 	exit 1;
 }
 $origin = hex($origin);
@@ -25,8 +25,8 @@ if (!defined $pl_origin) {
 }
 $pl_origin = hex($pl_origin);
 if ($pl_origin != $origin) {
-	printf "WARNING!!! The origin of the bz2 data is now 0x%04x. This needs to\n", $origin;
+	printf "WARNING!!! The origin of the lzip data is now 0x%04x. This needs to\n", $origin;
 	printf "           be updated in src2asm.pl (which currently says 0x%04x).\n", $pl_origin;
 	exit 3;
 }
-printf "Origin of bz2 data is 0x%04x and correct.\n", $origin;
+printf "Origin of lzip data is 0x%04x and correct.\n", $origin;
diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 230c5fb..8414357 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -463,7 +463,7 @@ void getrom() {
 	s[2] = _rom_src_data[2];
 	s[3] = '\0';
 	send_string(s);
-	send_string(CRLF " Type YES to download rom.tar.bz2 via XMODEM: ");
+	send_string(CRLF " Type YES to download rom.tar.lz via XMODEM: ");
 	msg_clr();
 	while (!sci_have_packet); /* spin */
 	if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) {