From 97aa0aae9f52a0964923e3be1b304835ac8963c4 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Wed, 2 Feb 2022 17:39:36 -0800
Subject: [PATCH] Bug Fix

Fixed a small issue in the boot management of the CPU speed for MBC and SBC platforms.
---
 Source/HBIOS/hbios.asm | 12 ++++++++----
 Source/ver.inc         |  2 +-
 Source/ver.lib         |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index f8146f48..0e4b9e30 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1802,30 +1802,34 @@ HB_CPUSPD2:
 ; THAT SUPPORT SOFTWARE SELECTABLE CPU SPEED.  UPDATE CB_CPUKHZ
 ; IN HCB AS WE DO THIS.
 ;
-#IF ((CPUSPDCAP==SPD_HILO) & (PLATFORM==PLT_MBC) & (CPUSPDDEF==SPD_HIGH))
+#IF ((CPUSPDCAP==SPD_HILO) & (PLATFORM==PLT_MBC))
+  #IF (CPUSPDDEF==SPD_HIGH)
 	; SET HIGH SPEED VIA RTC LATCH
 	LD	A,(HB_RTCVAL)
 	OR	%00001000		; SET HI SPEED BIT
 	LD	(HB_RTCVAL),A		; SAVE SHADOW
 	OUT	(RTCIO),A		; IMPLEMENT
 	; HL IS ALREADY CORRECT FOR FULL SPEED OPERATION
-#ELSE
+  #ELSE
 	; ADJUST HL TO REFLECT HALF SPEED OPERATION
 	SRL	H		; ADJUST HL ASSUMING
 	RR	L		; HALF SPEED OPERATION
+  #ENDIF
 #ENDIF
 ;
-#IF ((CPUSPDCAP==SPD_HILO) & (PLATFORM==PLT_SBC) & (CPUSPDDEF==SPD_HIGH))
+#IF ((CPUSPDCAP==SPD_HILO) & (PLATFORM==PLT_SBC))
+  #IF (CPUSPDDEF==SPD_HIGH)
 	; SET HIGH SPEED VIA RTC LATCH
 	LD	A,(HB_RTCVAL)
 	AND	~%00001000		; CLEAR HI SPEED BIT
 	LD	(HB_RTCVAL),A		; SAVE SHADOW
 	OUT	(RTCIO),A		; IMPLEMENT
 	; HL IS ALREADY CORRECT FOR FULL SPEED OPERATION
-#ELSE
+  #ELSE
 	; ADJUST HL TO REFLECT HALF SPEED OPERATION
 	SRL	H		; ADJUST HL ASSUMING
 	RR	L		; HALF SPEED OPERATION
+  #ENDIF
 #ENDIF
 ;
 #IF (CPUFAM == CPU_Z180)
diff --git a/Source/ver.inc b/Source/ver.inc
index 0ed9e30c..6c0cd517 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.153"
+#DEFINE BIOSVER	"3.1.1-pre.154"
diff --git a/Source/ver.lib b/Source/ver.lib
index 06000c8a..661456a8 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.153"
+	db	"3.1.1-pre.154"
 	endm