From 757f0b08ffb0334d8c54486c6f1eb978d0447969 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Mon, 16 Dec 2024 10:47:53 -0800
Subject: [PATCH] Minor Follow-up on KBD Interrupt Enhancement

- Add call to KBD_PREINIT to the CVDU driver.
---
 Source/HBIOS/cvdu.asm  | 5 +++++
 Source/HBIOS/hbios.asm | 3 +++
 Source/HBIOS/kbd.asm   | 6 ++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Source/HBIOS/cvdu.asm b/Source/HBIOS/cvdu.asm
index 8fce3e31..9b4d6f64 100644
--- a/Source/HBIOS/cvdu.asm
+++ b/Source/HBIOS/cvdu.asm
@@ -65,6 +65,11 @@ KBDENABLE	.SET	TRUE		; INCLUDE KBD KEYBOARD SUPPORT
 ; CVDU DRIVER - INITIALIZATION
 ;======================================================================
 ;
+CVDU_PREINIT:
+	LD	IY,CVDU_IDAT		; POINTER TO INSTANCE DATA
+	JP	KBD_PREINIT		; INITIALIZE KEYBOARD
+;	RET
+;
 CVDU_INIT:
 	LD	IY,CVDU_IDAT		; POINTER TO INSTANCE DATA
 	
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 4085220c..e03cc1dd 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -3885,6 +3885,9 @@ HB_PCINITTBL:
 #IF (UFENABLE)
 	.DW	UF_PREINIT
 #ENDIF
+#IF (CVDUENABLE)
+	.DW	CVDU_PREINIT
+#ENDIF
 #IF (VGAENABLE)
 	.DW	VGA_PREINIT
 #ENDIF
diff --git a/Source/HBIOS/kbd.asm b/Source/HBIOS/kbd.asm
index de4b2479..ad5d9aa9 100644
--- a/Source/HBIOS/kbd.asm
+++ b/Source/HBIOS/kbd.asm
@@ -102,11 +102,9 @@ KBD_CON_IOF	.EQU	$20	; XLAT DISABLED, MOUSE DISABLED, NO INTS
 ;__________________________________________________________________________________________________
 ;
 ; TO BE CALLED PRIOR TO INTERRUPTS BEING ENABLED
-; MUST BE CALLED FROM VIDEO DRIVER PREINIT WITH IY SET
+; MUST BE CALLED FROM VIDEO DRIVER PREINIT WITH IY SET.
 ; THIS PREVENTS INTERRUPT ISSUES IF 8242 HAS INTERRUPTS ENABLED
-;
-; AT STARTUP.  NOT USING IT FOR NOW BECAUSE IT IS NOT A PROBLEM IF
-; YOU DON'T USE THE KEYBOARD DURING BOOT.
+; AT STARTUP.
 ;
 KBD_PREINIT:
 ;