From aaae6c54462f0dc95194d4a3a81c76c5417dbe56 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sun, 12 Sep 2021 13:52:56 -0700
Subject: [PATCH] Fix UART Driver

- Breakage in UART detection routine corrected.
---
 Source/HBIOS/uart.asm | 8 +++-----
 Source/ver.inc        | 2 +-
 Source/ver.lib        | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Source/HBIOS/uart.asm b/Source/HBIOS/uart.asm
index 6e1d4544..0ab408ae 100644
--- a/Source/HBIOS/uart.asm
+++ b/Source/HBIOS/uart.asm
@@ -138,7 +138,7 @@ UART_INITUNIT:
 	LD	(IY+1),A		; AND SAVE IN CONFIG TABLE
 	OR	A			; SET FLAGS
 	RET	Z			; ABORT IF NOTHING THERE
-;	
+;
 	; UPDATE WORKING UART DEVICE NUM
 	LD	HL,UART_DEV		; POINT TO CURRENT UART DEVICE NUM
 	LD	A,(HL)			; PUT IN ACCUM
@@ -643,10 +643,9 @@ UART_DEVICE:
 ;
 UART_DETECT:
 	CALL	UART_CHIP		; DETECT CHIP VARIANT
-	RET	Z			; DONE IF NO CHIP
-	
 	;LD	A,UART_16550A		; *DEBUG*
-	
+	OR	A
+	RET	Z			; DONE IF NO CHIP
 	LD	C,A			; PUT CHIP VARIANT IN C
 ;
 ; *** FIXME *** THIS NEEDS TO CHANGE WHEN INTMODE 2/3 IS IMPLEMENTED.  AT THIS
@@ -679,7 +678,6 @@ UART_DETECT1:
 ;
 UART_DETECT2:
 	LD	A,C			; RETURN RESULT IN A
-	CALL	PRTHEXBYTE
 	RET
 ;
 ; DETERMINE TEH UART CHIP VARIANT AND RETURN IN A
diff --git a/Source/ver.inc b/Source/ver.inc
index ac5dc7f2..79ac30d6 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.113"
+#DEFINE BIOSVER	"3.1.1-pre.114"
diff --git a/Source/ver.lib b/Source/ver.lib
index a0203643..23c1d7be 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.113"
+	db	"3.1.1-pre.114"
 	endm