From e974a4a9607945e3ca891dae9bb4110db6409801 Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Tue, 31 May 2022 21:06:02 +0800
Subject: [PATCH] Recovery mode message, ay-3-8910 build fix

---
 Source/Apps/assign.asm   |  2 +-
 Source/HBIOS/ay38910.asm |  8 ++++----
 Source/HBIOS/hbios.asm   | 12 ++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Source/Apps/assign.asm b/Source/Apps/assign.asm
index 258573e8..757859f4 100644
--- a/Source/Apps/assign.asm
+++ b/Source/Apps/assign.asm
@@ -244,7 +244,7 @@ initcpm3:
 ; The CP/M 3 drvtbl is in common memory, but the XDPHs are not.
 ; So, here we temporarily swap the bank to the CP/M 3 system
 ; bank.  We cannot use the CP/M Direct BIOS call because it
-; explicitly blocks use of SELMEM, so we are foreced to use
+; explicitly blocks use of SELMEM, so we are forced to use
 ; HBIOS call.  The CP/M 3 system bank is always the HBIOS
 ; user bank.
 ;
diff --git a/Source/HBIOS/ay38910.asm b/Source/HBIOS/ay38910.asm
index 2dde8d29..99743f68 100644
--- a/Source/HBIOS/ay38910.asm
+++ b/Source/HBIOS/ay38910.asm
@@ -534,7 +534,7 @@ AY_EI:
 AY_WRTPSG:
 	CALL	AY_DI
 #IFDEF SBCV2004
-	LD	A,(RTCVAL)		; GET CURRENT RTC LATCH VALUE
+	LD	A,(HB_RTCVAL)		; GET CURRENT RTC LATCH VALUE
 	OR	%00001000		; SBC-V2-004 CHANGE
 	OUT	(RTCIO),A		; TO HALF CLOCK SPEED
 #ENDIF
@@ -553,7 +553,7 @@ AY_WRTPSG:
 	OUT0	(Z180_DCNTL),A		; AND RESTORE IT
 #ENDIF
 #IFDEF SBCV2004
-	LD	A,(RTCVAL)		; SBC-V2-004 CHANGE TO
+	LD	A,(RTCDEFVAL)		; SBC-V2-004 CHANGE TO
 	OUT	(RTCIO),A		; NORMAL CLOCK SPEED
 #ENDIF
 	JP	AY_EI
@@ -565,7 +565,7 @@ AY_WRTPSG:
 AY_RDPSG:
 	CALL	AY_DI
 #IFDEF SBCV2004
-	LD	A,(RTCVAL)		; GET CURRENT RTC LATCH VALUE
+	LD	A,(HB_RTCVAL)		; GET CURRENT RTC LATCH VALUE
 	OR	%00001000		; SBC-V2-004 CHANGE
 	OUT	(RTCIO),A		; TO HALF CLOCK SPEED
 #ENDIF
@@ -584,7 +584,7 @@ AY_RDPSG:
 	OUT0	(Z180_DCNTL),A		; AND RESTORE IT
 #ENDIF
 #IFDEF SBCV2004
-	LD	A,(RTCVAL)		; SBC-V2-004 CHANGE TO
+	LD	A,(RTCDEFVAL)		; SBC-V2-004 CHANGE TO
 	OUT	(RTCIO),A		; NORMAL CLOCK SPEED
 #ENDIF
 	JP	AY_EI
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 8fcc5a53..ea2846ab 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -2284,6 +2284,18 @@ NXTMIO:	LD	A,(HL)
 	CALL	PRTSTRD
 	.TEXT	"HBIOS MUTEX ENABLED$"
 #ENDIF
+;
+; DISPLAY RECOVERY MODE MESSAGE
+;
+#IF (BT_REC_TYPE != BT_REC_NONE)
+	LD	A,(HB_BOOT_REC)		; IF WE ARE IN RECOVERY MODE
+	OR	A			; DISPLAY RECOVERY MODE MESSAGE
+	JR	Z,NOT_REC_M2
+	CALL	NEWLINE
+	CALL	PRTSTRD
+	.TEXT	"RECOVERY MODE$"
+#ENDIF
+NOT_REC_M2:
 ;
 	DIAG(%11111111)
 ;