From 74dc98b1403552aab2df4c051e31049e5c7dee12 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Thu, 26 Aug 2021 17:23:52 -0700
Subject: [PATCH] Fix DSKY Initialization

- Missed a couple things in the last round of DSKY changes.
---
 Source/HBIOS/dbgmon.asm | 4 ++--
 Source/HBIOS/dsky.asm   | 2 +-
 Source/HBIOS/dskyng.asm | 2 +-
 Source/HBIOS/hbios.asm  | 2 ++
 Source/HBIOS/romldr.asm | 2 --
 Source/ver.inc          | 2 +-
 Source/ver.lib          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/HBIOS/dbgmon.asm b/Source/HBIOS/dbgmon.asm
index 42e80252..4b8d512a 100644
--- a/Source/HBIOS/dbgmon.asm
+++ b/Source/HBIOS/dbgmon.asm
@@ -1017,7 +1017,7 @@ DSKY_ENTRY:
 ;	START UP THE SYSTEM WITH THE FRONT PANEL INTERFACE
 ;_____________________________________________________________________________
 ;
-	CALL    DSKY_INIT		; INIT 8255
+	CALL	DSKY_PREINIT		; INITIALIZE DSKY
 
   #IF (DSKYMODE == DSKYMODE_NG)
 	CALL 	DSKY_BEEP
@@ -1501,7 +1501,7 @@ SEGDECODE:
 #IF (DSKYMODE == DSKYMODE_NG)
 ;
 CPUUP	.DB 	$40,$39,$73,$3E,$00,$3E,$73,$40	; "-CPU UP-" (RAW SEG)
-MSGBOOT	.DB	$7F,$5C,$5C,$78,$A0,$00,$00,$00 ; "Boot!   " (RAW SEG)
+MSGBOOT	.DB	$7F,$5C,$5C,$78,$82,$00,$00,$00 ; "Boot!   " (RAW SEG)
 ADDR	.DB	$17,$18,$19,$10,$00,$00,$00,$00	; "Adr 0000" (ENCODED)
 PORT	.DB	$13,$14,$15,$16,$10,$10,$00,$00	; "Port  00" (ENCODED)
 GOTO	.DB	$1A,$14,$10,$10,$00,$00,$00,$00	; "Go  0000" (ENCODED)
diff --git a/Source/HBIOS/dsky.asm b/Source/HBIOS/dsky.asm
index e0c640a1..8b577ce2 100644
--- a/Source/HBIOS/dsky.asm
+++ b/Source/HBIOS/dsky.asm
@@ -73,7 +73,7 @@ DSKY_RESET:
 	POP	AF
 	RET
 ;
-#IFNDEF ROMLDR
+#IFDEF HBIOS
 ;
 DSKY_INIT:
 	CALL	NEWLINE			; FORMATTING
diff --git a/Source/HBIOS/dskyng.asm b/Source/HBIOS/dskyng.asm
index 103e4d2a..4fb46adb 100644
--- a/Source/HBIOS/dskyng.asm
+++ b/Source/HBIOS/dskyng.asm
@@ -141,7 +141,7 @@ DSKY_RESET2:
 ;  DISPLAY DSKY INFO
 ;____________________________________________________________________________________________________
 ;
-#IFNDEF ROMLDR
+#IFDEF HBIOS
 ;
 DSKY_INIT:
 	CALL	NEWLINE			; FORMATTING
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 581c74bd..87ba98cf 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -68,6 +68,8 @@
 ;
 #INCLUDE "std.asm"
 ;
+#DEFINE	HBIOS
+;
 ; MAKE SURE EXACTLY ONE OF ROMBOOT, APPBOOT, IMGBOOT IS DEFINED.
 ;
 MODCNT	.EQU	0
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index 6208b89f..386b93fd 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -32,8 +32,6 @@
 ; the desired executable image.
 ;
 #INCLUDE "std.asm"	; standard RomWBW constants
-
-#define ROMLDR
 ;
 #ifndef BOOT_DEFAULT
 #define BOOT_DEFAULT "H"
diff --git a/Source/ver.inc b/Source/ver.inc
index ea83f70c..69ad0c84 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	03
-#DEFINE BIOSVER	"3.1.1-pre.109"
+#DEFINE BIOSVER	"3.1.1-pre.110"
diff --git a/Source/ver.lib b/Source/ver.lib
index 728461dc..0dc11c0c 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.109"
+	db	"3.1.1-pre.110"
 	endm