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 1/4] 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

From fc760e90e07abd20e41b684fc6e7f75742c8c7e6 Mon Sep 17 00:00:00 2001
From: Phillip Stevens <phillip.stevens@gmail.com>
Date: Fri, 15 Nov 2019 11:46:20 +1100
Subject: [PATCH 2/4] hbios - z180 CMR/CCR order

---
 Source/HBIOS/hbios.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 462ebd44..a4b72085 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -776,8 +776,8 @@ HB_START:
 
 	; SET DEFAULT CPU CLOCK MULTIPLIERS (XTAL / 2)
 	XOR	A
-	OUT0	(Z180_CCR),A
 	OUT0	(Z180_CMR),A
+	OUT0	(Z180_CCR),A
 
 	; SET DEFAULT WAIT STATES
 	LD	A,$F0

From 326ee0ae67a10c6bfa00ca2f0cadf5e386291503 Mon Sep 17 00:00:00 2001
From: Phillip Stevens <phillip.stevens@gmail.com>
Date: Fri, 15 Nov 2019 11:56:24 +1100
Subject: [PATCH 3/4] hbios - z180 CMR/CCR testing

---
 Source/HBIOS/hbios.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index a4b72085..4ca4b0cf 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1269,7 +1269,7 @@ HB_CPU1:
 	LD	C,(CPUOSC / 2) / 1000000
 	LD	DE,(CPUOSC / 2) / 1000
 ;
-#IF (Z180_CLKDIV >= 1)
+#IF (Z180_CLKDIV = 1)
 	LD	A,(HB_CPUTYPE)	; GET CPU TYPE
 	CP	2		; Z8S180 REV K OR BETTER?
 	JR	C,HB_CPU2	; IF NOT, NOT POSSIBLE!
@@ -1281,7 +1281,7 @@ HB_CPU1:
 	LD	DE,CPUOSC / 1000
 #ELSE
 ;
-#IF (Z180_CLKDIV >= 2)
+#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!

From 084df830efedc723f98579692dc55bb04d13f9a6 Mon Sep 17 00:00:00 2001
From: Phillip Stevens <phillip.stevens@gmail.com>
Date: Fri, 15 Nov 2019 19:14:43 +1100
Subject: [PATCH 4/4] hbios - z180 TASM equality check

---
 Source/HBIOS/hbios.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 4ca4b0cf..f7b22071 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1269,7 +1269,7 @@ HB_CPU1:
 	LD	C,(CPUOSC / 2) / 1000000
 	LD	DE,(CPUOSC / 2) / 1000
 ;
-#IF (Z180_CLKDIV = 1)
+#IF (Z180_CLKDIV == 1)
 	LD	A,(HB_CPUTYPE)	; GET CPU TYPE
 	CP	2		; Z8S180 REV K OR BETTER?
 	JR	C,HB_CPU2	; IF NOT, NOT POSSIBLE!
@@ -1281,7 +1281,7 @@ HB_CPU1:
 	LD	DE,CPUOSC / 1000
 #ELSE
 ;
-#IF (Z180_CLKDIV = 2)
+#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!