From c3e78ec8f5a8415bba0b74bd22c75d448e299a46 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sat, 25 Apr 2020 10:48:35 -0700
Subject: [PATCH] Minor Cleanup

---
 Source/Apps/Tune/Build.cmd | 4 ++--
 Source/HBIOS/hbios.asm     | 8 ++++----
 Source/HBIOS/std.asm       | 2 +-
 Source/HBIOS/tms.asm       | 9 ++++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Source/Apps/Tune/Build.cmd b/Source/Apps/Tune/Build.cmd
index 45186edc..82fa4c33 100644
--- a/Source/Apps/Tune/Build.cmd
+++ b/Source/Apps/Tune/Build.cmd
@@ -6,8 +6,8 @@ set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF -dWBW Tune.asm Tune.com Tune.lst
-tasm -t180 -g3 -fFF -dZX Tune.asm Tunezx.com Tune.lst
-tasm -t180 -g3 -fFF -dMSX Tune.asm Tunemsx.com Tune.lst
+tasm -t180 -g3 -fFF -dZX Tune.asm Tunezx.com Tunezx.lst
+tasm -t180 -g3 -fFF -dMSX Tune.asm Tunemsx.com Tunemsx.lst
 
 if errorlevel 1 goto :eof
 
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index cc7fda0c..1120cebe 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -986,10 +986,6 @@ HB_START1:				; BNKCALL ARRIVES HERE, BUT NOW RUNNING IN RAM BANK
 ;
 	; MAKE SURE IM1 INT VECTOR IS RIGHT
   #IF (INTMODE == 1)
-    #IF (TMSTIMENABLE)
-	CALL	TMS_INT_DIS	; SPECIAL CASE - NEED TO STOP TMS9918 FROM FIRING INTERRUPTS
-    #ENDIF			; WHEN DRIVER IS LOADED - IT WILL BE RELOADED
-
 	; JP INT_IM1 IF INTERRUPT MODE ACTIVE
 	LD	A,$C3
 	LD	($0038),A
@@ -1259,6 +1255,10 @@ HB_CPU2:
 ;
 #ENDIF
 ;
+#IF (TMSENABLE)
+	CALL	TMS_PREINIT
+#ENDIF
+;
 ; INITIALIZE HEAP STORAGE
 ;
 	; INITIALIZE POINTERS
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index 15dfdb34..cbd8f0a3 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -186,7 +186,7 @@ AYMODE_RCZ180	.EQU	4		; RC2014 SOUND MODULE BY ED BRINDLEY ON Z180
 TMSMODE_NONE	.EQU	0
 TMSMODE_SCG	.EQU	1		; SCG ECB BOARD
 TMSMODE_N8	.EQU	2		; N8 BUILT-IN VIDEO
-TMSMODE_RC2014	.EQU	3		; RC2014 BUILT-IN VIDEO
+TMSMODE_RC	.EQU	3		; RC2014 BUILT-IN VIDEO
 ;
 ; SERIAL DEVICE CONFIGURATION CONSTANTS
 ;
diff --git a/Source/HBIOS/tms.asm b/Source/HBIOS/tms.asm
index e6c05c0c..14c50b3d 100644
--- a/Source/HBIOS/tms.asm
+++ b/Source/HBIOS/tms.asm
@@ -22,7 +22,7 @@ TMSINTEN:       .EQU   5               ; INTERRUPT ENABLE BIT
 	.ECHO	"TMS INTERRUPTS ENABLED"
 #ENDIF
 
-#IF (TMSMODE == TMSMODE_RC2014)
+#IF (TMSMODE == TMSMODE_RC)
 TMS_DATREG	.EQU	$BE		; READ/WRITE DATA
 TMS_CMDREG	.EQU	$BF		; READ STATUS / WRITE REG SEL
 TMS_PPIA	.EQU	0		; PPI PORT A
@@ -80,6 +80,13 @@ TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 ; TMS DRIVER - INITIALIZATION
 ;======================================================================
 ;
+TMS_PREINIT:
+#IF (TMSTIMENABLE)
+	CALL	TMS_INT_DIS	; SPECIAL CASE - NEED TO STOP TMS9918 FROM FIRING INTERRUPTS
+#ENDIF				; WHEN DRIVER IS LOADED - IT WILL BE RELOADED
+
+	RET
+;
 TMS_INIT:
 #IF (CPUFAM == CPU_Z180)
 	CALL	TMS_Z180IO