From c0ca96cb9672e11570eddcd482aac51943ace91d Mon Sep 17 00:00:00 2001
From: Phillip Stevens <phillip.stevens@gmail.com>
Date: Fri, 15 Nov 2019 11:40:50 +1100
Subject: [PATCH] hbios - z180 CMR/CCR config

---
 Source/HBIOS/hbios.asm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 3169899d..462ebd44 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1279,19 +1279,23 @@ HB_CPU1:
 	; REFLECT SPEED CHANGE
 	LD	C,CPUOSC / 1000000
 	LD	DE,CPUOSC / 1000
-#ENDIF
-
+#ELSE
+;
 #IF (Z180_CLKDIV >= 2)
+	LD	A,(HB_CPUTYPE)	; GET CPU TYPE
 	CP	3		; Z8S180 REV N OR BETTER?
 	JR	C,HB_CPU2	; IF NOT, NOT POSSIBLE!
 	; SET CPU MULTIPLIER TO 1 RESULTING IN XTAL * 2 SPEED
 	LD	A,$80
-	OUT0	(Z180_CMR),A
+	OUT0	(Z180_CMR),A	; MUST SET CMR BEFORE CCR
+	OUT0	(Z180_CCR),A
 	; REFLECT SPEED CHANGE
 	LD	C,(CPUOSC * 2) / 1000000
 	LD	DE,(CPUOSC * 2) / 1000
 #ENDIF
 ;
+#ENDIF
+;
 HB_CPU2:
 	; SAVE CPU SPEED IN CONFIG BLOCK
 	LD	A,C