From 389cd70e7e76b3bab5afcb5b0741cedc14616cc9 Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Fri, 31 Jan 2020 23:02:53 -0800
Subject: [PATCH] FDU alignment fix, verbose diff, don't build Tune

---
 Source/Apps/FDU/FDU.asm | 8 ++++----
 Source/Apps/Makefile    | 3 ++-
 Tools/Makefile.inc      | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Source/Apps/FDU/FDU.asm b/Source/Apps/FDU/FDU.asm
index 470ce80c..c27cf356 100644
--- a/Source/Apps/FDU/FDU.asm
+++ b/Source/Apps/FDU/FDU.asm
@@ -3346,7 +3346,7 @@ FXRR5:	INC	C			; [04] POINT TO DATA PORT
 ;
 	; AVOID RETURN FROM HALT IN PROBLEMATIC ADDRESS RANGE XX30-XX3F!!!
 	.IF ((($ & 0F0H) == 20H) | (($ & 0F0H) == 30H))
-		.DS	(($ & 0FF00H) + 40H) - $
+		.FILL	(($ & 0FF00H) + 40H) - $
 		; .ORG	(($ & 0FF00H) + 40H)
 	.ENDIF
 ;
@@ -3375,7 +3375,7 @@ IFXRRX	.EQU	$ - IFXRR
 ;
 	; AVOID RETURN FROM HALT IN PROBLEMATIC ADDRESS RANGE XX30-XX3F!!!
 	.IF ((($ & 0F0H) == 20H) | (($ & 0F0H) == 30H))
-		.DS	(($ & 0FF00H) + 40H) - $
+		.FILL	(($ & 0FF00H) + 40H) - $
 	  ; .ORG	(($ & 0FF00H) + 40H)
 	.ENDIF
 ;
@@ -3454,7 +3454,7 @@ FXRW5:	INC	C			; [04] POINT TO DATA PORT
 ;	
 	; AVOID RETURN FROM HALT IN PROBLEMATIC ADDRESS RANGE XX30-XX3F!!!
 	.IF ((($ & 0F0H) == 20H) | (($ & 0F0H) == 30H))
-		.DS	(($ & 0FF00H) + 40H) - $
+		.FILL	(($ & 0FF00H) + 40H) - $
 	  ; .ORG	(($ & 0FF00H) + 40H)
 	.ENDIF
 ;
@@ -3481,7 +3481,7 @@ IFXRW2:	EI
 ;
 	; AVOID RETURN FROM HALT IN PROBLEMATIC ADDRESS RANGE XX30-XX3F!!!
 	.IF ((($ & 0F0H) == 20H) | (($ & 0F0H) == 30H))
-		.DS	(($ & 0FF00H) + 40H) - $
+		.FILL	(($ & 0FF00H) + 40H) - $
 	  ; .ORG	(($ & 0FF00H) + 40H)
 	.ENDIF
 ;
diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile
index fcf3a5d6..d71516fc 100644
--- a/Source/Apps/Makefile
+++ b/Source/Apps/Makefile
@@ -2,7 +2,8 @@ OBJECTS = SysGen.com Survey.com \
 	SysCopy.COM Assign.COM Format.COM Talk.COM OSLdr.COM Mode.COM RTC.COM \
 	Timer.COM IntTest.COM
 OTHERS = *.hex *.com
-SUBDIRS = XM FDU Tune FAT
+SUBDIRS = XM FDU FAT 
+# Tune - left out for now
 DEST = ../../Binary/Apps
 TOOLS =../../Tools
 RELPATH = Source/Apps
diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc
index 0408f024..f4e2db96 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -142,9 +142,11 @@ diff::
         if [ -f $$df -a -f $$sf ] ; then \
 			if ! cmp -s $$sf $$df ; then \
 				echo $$sf and $$df differ ; \
-				cmp -bl $$sf $$df ; \
-				hexdump -Cv $$sf > $$sf.dump ; \
-				hexdump -Cv $$df > $$(basename $$df).dump.diff ; \
+				if [ "$(VERBOSEDIFF)" ] ; then \
+					cmp -bl $$sf $$df ; \
+					hexdump -Cv $$sf > $$sf.dump ; \
+					hexdump -Cv $$df > $$(basename $$df).dump.diff ; \
+				fi \
 			fi \
 		fi \
     done