From 7d5dc565f38e8db55a146316f44dc89466e8dd37 Mon Sep 17 00:00:00 2001
From: Dean Netherton <dinoboards@netherton.org>
Date: Sun, 4 Aug 2024 15:09:21 +1000
Subject: [PATCH] ez80: tms driver - minor update/refactor

---
 Source/HBIOS/Config/RCEZ80_std.asm |  2 +-
 Source/HBIOS/tms.asm               | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Source/HBIOS/Config/RCEZ80_std.asm b/Source/HBIOS/Config/RCEZ80_std.asm
index e71a921f..bd8a9527 100644
--- a/Source/HBIOS/Config/RCEZ80_std.asm
+++ b/Source/HBIOS/Config/RCEZ80_std.asm
@@ -40,7 +40,7 @@ DUARTENABLE	.SET	FALSE		; DUART: ENABLE 2681/2692 SERIAL DRIVER (DUART.ASM)
 ;
 LPTENABLE	.SET	FALSE		; LPT: ENABLE CENTRONICS PRINTER DRIVER (LPT.ASM)
 ;
-TMSENABLE	.SET	FALSE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
+TMSENABLE	.SET	TRUE		; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM)
 TMSTIMENABLE	.SET	FALSE		; TMS: ENABLE TIMER INTERRUPTS (REQUIRES IM1)
 TMSMODE		.SET	TMSMODE_MSX9958	; TMS: DRIVER MODE: TMSMODE_[SCG|N8|MBC|MSX|MSX9958|MSXKBD|COLECO]
 MKYENABLE	.SET	FALSE		; MSX 5255 PPI KEYBOARD COMPATIBLE DRIVER (REQUIRES TMS VDA DRIVER)
diff --git a/Source/HBIOS/tms.asm b/Source/HBIOS/tms.asm
index 7546d53e..25b48e53 100644
--- a/Source/HBIOS/tms.asm
+++ b/Source/HBIOS/tms.asm
@@ -252,6 +252,12 @@ TMS_INIT:
 	RET
 ;
 TMS_INIT1:
+#IF (TMSTIMENABLE)
+	EZ80_UTIL_DEBUG
+
+	PRTS(" INTERRUPT ENABLED$")
+
+#ENDIF
 	CALL 	TMS_CRTINIT		; SETUP THE TMS CHIP REGISTERS
 	CALL	TMS_LOADFONT		; LOAD FONT DATA FROM ROM TO TMS STRORAGE
 	CALL	TMS_CLEAR		; CLEAR SCREEN, HOME CURSOR
@@ -814,7 +820,7 @@ TMS_SETCUR1:				; READ GLYPH LOOP
 	IN	A,(TMS_DATREG)		; GET NEXT BYTE
 	TMS_IODELAY			; IO DELAY
 	LD	(HL),A			; SAVE VALUE IN BUF
-	INC	HL					; BUMP BUF POINTER
+	INC	HL			; BUMP BUF POINTER
 	DJNZ	TMS_SETCUR1		; LOOP FOR 8 BYTES
 ;
 	; NOW WRITE INVERTED GLYPH INTO FONT INDEX 255
@@ -1098,12 +1104,7 @@ TMS_Z180IOX:
 
 #IF (TMSTIMENABLE & (INTMODE > 0))
 TMS_TSTINT:
-#IF (CPUFAM == CPU_EZ80)
-	LD	BC, IO_SEGMENT<<8 | TMS_CMDREG
-	IN	A,(C)			; TEST FOR INT FLAG
-#ELSE
-	IN	A,(TMS_CMDREG)		; TEST FOR INT FLAG
-#ENDIF
+	IN_A_NN(TMS_CMDREG)
 	AND	$80
 	JR	NZ,TMS_INTHNDL
 	AND	$00			; RETURN Z - NOT HANDLED