From ce3f7f2224dc33ce4ff626372c834dc1c71d0556 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Mon, 4 May 2020 09:07:09 -0700
Subject: [PATCH] Small bug fix

- Build error in romldr.asm when using custom boot timeout.
- Handle CP/M 3 error mode variable properly.
---
 Source/CPM3/diskio.z80  | 12 +++++++++---
 Source/HBIOS/romldr.asm |  2 +-
 Source/ver.inc          |  2 +-
 Source/ver.lib          |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/CPM3/diskio.z80 b/Source/CPM3/diskio.z80
index d9f3ccb1..61f63900 100644
--- a/Source/CPM3/diskio.z80
+++ b/Source/CPM3/diskio.z80
@@ -747,6 +747,9 @@ err_api:
 	ld	hl,str_err_api
 	jr	err
 err:
+	ld	a,(@ermde)		; get error mode
+	cp	0FFh			; FFh means suppress
+	jr	z,err_ret		; if so, go to err return
 	push	hl
 	call	?pderr
 	pop	hl
@@ -755,9 +758,12 @@ err:
 	call	?pmsg
 	call	cin$echo
 	cp	'Y'
-	ret	nz
-	ld	hl,(retry$adr)
-	jp	(hl)
+	jr	nz,err_ret		; return error to caller
+	ld	hl,(retry$adr)		; get retry address
+	jp	(hl)			; and go there
+err_ret:
+	ld	a,1			; signal I/O error
+	ret				; and done
 
 str_err_retry	db	", Retry (Y/N) ? ",0
 str_err_nodisk	db	", No disk",0
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index db5f1750..0abb1668 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -219,7 +219,7 @@ wtkey:
 	dec	bc			; decrement
 	ld	(acmd_to),bc		; resave it
 	ld	de,625			; 16us * 625 = 10ms
-	call	VDELAY			; 10ms delay
+	call	vdelay			; 10ms delay
 #endif
 ;
 	jr	wtkey			; loop
diff --git a/Source/ver.inc b/Source/ver.inc
index f5695008..49be83dd 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.0"
+#DEFINE BIOSVER	"3.1.1-pre.1"
diff --git a/Source/ver.lib b/Source/ver.lib
index 37b9c82d..f71eb627 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.0"
+	db	"3.1.1-pre.1"
 	endm