From 964cc4b91a2166c2a609b62f0388dc9788ae5bb2 Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Sun, 16 Feb 2020 17:41:43 -0800
Subject: [PATCH] fixed include order dependency

---
 Source/HBIOS/hbios.inc | 12 ++++++------
 Source/HBIOS/std.asm   | 14 +++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Source/HBIOS/hbios.inc b/Source/HBIOS/hbios.inc
index 026fdd4e..444bae8b 100644
--- a/Source/HBIOS/hbios.inc
+++ b/Source/HBIOS/hbios.inc
@@ -125,12 +125,12 @@ VDADEV_CVDU	.EQU	$10		; ECB COLOR VDU - MOS 8563
 VDADEV_NEC	.EQU	$20		; ECB UPD7220 - NEC UPD7220
 VDADEV_TMS	.EQU	$30		; N8 ONBOARD VDA SUBSYSTEM - TMS 9918
 VDADEV_VGA	.EQU	$40		; ECB VGA3 - HITACHI HD6445
-;
-; EMULATION TYPES
-;
-EMUTYP_NONE	.EQU	0		; NONE
-EMUTYP_TTY	.EQU	1		; TTY
-EMUTYP_ANSI	.EQU	2		; ANSI
+;;
+;; EMULATION TYPES - moved to std.asm
+;;
+;EMUTYP_NONE	.EQU	0		; NONE
+;EMUTYP_TTY	.EQU	1		; TTY
+;EMUTYP_ANSI	.EQU	2		; ANSI
 ;	
 ; HBIOS CONTROL BLOCK OFFSETS
 ; WARNING: THESE OFFSETS WILL CHANGE SIGNIFICANTLY BETWEEN RELEASES
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index c552b5a3..744f7afe 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -44,9 +44,6 @@ PLT_EZZ80	.EQU	9		; EASY Z80
 PLT_SCZ180	.EQU	10		; SCZ180
 PLT_DYNO	.EQU	11		; DYNO MICRO-ATX MOTHERBOARD
 ;
-#IF (BIOS == BIOS_WBW)
-#INCLUDE "hbios.inc"
-#ENDIF
 ;
 ; CPU TYPES
 ;
@@ -306,6 +303,12 @@ USELZSA2	.EQU	FALSE	; USE COMPRESSED FONTS.
 KBD_US		.EQU	0	; US ENGLISH
 KBD_DE		.EQU	1	; GERMAN
 ;
+; EMULATION TYPES
+;
+EMUTYP_NONE     .EQU    0               ; NONE
+EMUTYP_TTY      .EQU    1               ; TTY
+EMUTYP_ANSI     .EQU    2               ; ANSI
+;
 ; DEVICE DRIVER TO BE INITIALIZED FIRST. FIRST CIO DRIVER, UNIT 0 INITIALIZED BECOMES PRIMARY CONSOLE.
 ; IS AN INDEX INTO THE ENABLED INITIALIZATION DRIVER LIST i.e. ASCI, UART, SIO, ACIA, PIO, UF ETC.
 ; EXAMPLE: IF ONLY UART, SIO AND PIO ARE ENABLE AND THE SIO IS DESIRED AS THE PRIMARY CONSOLE, 
@@ -315,6 +318,11 @@ FORCECON	.EQU	0	; DEFAULT IS TO FOLLOW NORMAL SEQUENCE
 ;
 #INCLUDE "build.inc"		; INCLUDE USER CONFIG, ADD VARIANT, TIMESTAMP, & ROMSIZE
 ;
+#IF (BIOS == BIOS_WBW)
+#INCLUDE "hbios.inc"
+#ENDIF
+;
+;
 ; INCLUDE Z180 REGISTER DEFINITIONS
 ;
 #IF (BIOS == BIOS_WBW)