From 1831141abdeadefc6de11d3d35f4641ae222079d Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Thu, 5 Mar 2020 12:54:22 -0800
Subject: [PATCH 1/8] Finalize Pre-release 34

Final support for FreeRTOS
---
 Doc/ChangeLog.txt                      |  1 +
 ReadMe.txt                             |  2 +-
 Source/CBIOS/ver.inc                   |  2 +-
 Source/CPM22/ver.inc                   |  2 +-
 Source/CPM3/ver.inc                    |  2 +-
 Source/HBIOS/Config/SCZ180_126_mtx.asm | 27 ++++++++++++++++++++++++++
 Source/HBIOS/Config/SCZ180_130_mtx.asm | 27 ++++++++++++++++++++++++++
 Source/HBIOS/Makefile                  |  4 +++-
 Source/HBIOS/cfg_dyno.asm              |  1 +
 Source/HBIOS/cfg_ezz80.asm             |  1 +
 Source/HBIOS/cfg_master.asm            |  1 +
 Source/HBIOS/cfg_mk4.asm               |  1 +
 Source/HBIOS/cfg_n8.asm                |  1 +
 Source/HBIOS/cfg_rcz180.asm            |  1 +
 Source/HBIOS/cfg_rcz80.asm             |  1 +
 Source/HBIOS/cfg_sbc.asm               |  1 +
 Source/HBIOS/cfg_scz180.asm            |  1 +
 Source/HBIOS/cfg_zeta.asm              |  1 +
 Source/HBIOS/cfg_zeta2.asm             |  1 +
 Source/HBIOS/hbios.asm                 | 19 +++++++++++++-----
 Source/HBIOS/ver.inc                   |  2 +-
 Source/ZSDOS/ver.inc                   |  2 +-
 22 files changed, 89 insertions(+), 12 deletions(-)
 create mode 100644 Source/HBIOS/Config/SCZ180_126_mtx.asm
 create mode 100644 Source/HBIOS/Config/SCZ180_130_mtx.asm

diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt
index c6697e08..895dd114 100644
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -50,6 +50,7 @@ Version 2.9.2
 - PMS: Added CP/M 3 manuals
 - WBW: Boot from any slice
 - C?M: Added Unix build process
+- PLS: FreeRTOS compatibility
 
 Version 2.9.1
 -------------
diff --git a/ReadMe.txt b/ReadMe.txt
index 003c1230..bbb625f3 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -7,7 +7,7 @@
 ***********************************************************************
 
 Wayne Warthen (wwarthen@gmail.com)
-Version 2.9.2-pre.33, 2020-02-28
+Version 2.9.2-pre.34, 2020-03-05
 https://www.retrobrewcomputers.org/
 
 RomWBW is a ROM-based implementation of CP/M-80 2.2 and Z-System for 
diff --git a/Source/CBIOS/ver.inc b/Source/CBIOS/ver.inc
index 8320a3c2..67178022 100644
--- a/Source/CBIOS/ver.inc
+++ b/Source/CBIOS/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	9
 #DEFINE	RUP	2
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.33"
+#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/CPM22/ver.inc b/Source/CPM22/ver.inc
index 8320a3c2..67178022 100644
--- a/Source/CPM22/ver.inc
+++ b/Source/CPM22/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	9
 #DEFINE	RUP	2
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.33"
+#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/CPM3/ver.inc b/Source/CPM3/ver.inc
index 90c458fb..9f3f8d3b 100644
--- a/Source/CPM3/ver.inc
+++ b/Source/CPM3/ver.inc
@@ -3,5 +3,5 @@ rmn	equ	9
 rup	equ	2
 rtp	equ	0
 biosver	macro
-	db	"2.9.2-pre.33"
+	db	"2.9.2-pre.34"
 	endm
diff --git a/Source/HBIOS/Config/SCZ180_126_mtx.asm b/Source/HBIOS/Config/SCZ180_126_mtx.asm
new file mode 100644
index 00000000..69f4b091
--- /dev/null
+++ b/Source/HBIOS/Config/SCZ180_126_mtx.asm
@@ -0,0 +1,27 @@
+;
+;==================================================================================================
+;   SC126 STANDARD CONFIGURATION W/ HBIOS MUTEX
+;==================================================================================================
+;
+; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
+; CFG_<PLT>.ASM INCLUDED FILE WHICH IS FOUND IN THE PARENT DIRECTORY.  THIS FILE CONTAINS
+; COMMON CONFIGURATION SETTINGS THAT OVERRIDE THE DEFAULTS.  IT IS INTENDED THAT YOU MAKE
+; YOUR CUSTOMIZATIONS IN THIS FILE AND JUST INHERIT ALL OTHER SETTINGS FROM THE DEFAULTS.
+; EVEN BETTER, YOU CAN MAKE A COPY OF THIS FILE WITH A NAME LIKE <PLT>_XXX.ASM AND SPECIFY
+; YOUR FILE IN THE BUILD PROCESS.
+;
+; THE SETTINGS BELOW ARE THE SETTINGS THAT ARE MOST COMMONLY MODIFIED FOR THIS PLATFORM.
+; MANY OF THEM ARE EQUAL TO THE SETTINGS IN THE INCLUDED FILE, SO THEY DON'T REALLY DO
+; ANYTHING AS IS.  THEY ARE LISTED HERE TO MAKE IT EASY FOR YOU TO ADJUST THE MOST COMMON
+; SETTINGS.
+;
+; N.B., SINCE THE SETTINGS BELOW ARE REDEFINING VALUES ALREADY SET IN THE INCLUDED FILE,
+; TASM INSISTS THAT YOU USE THE .SET OPERATOR AND NOT THE .EQU OPERATOR BELOW. ATTEMPTING
+; TO REDEFINE A VALUE WITH .EQU BELOW WILL CAUSE TASM ERRORS!
+;
+; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
+; DIRECTORIES ABOVE THIS ONE).
+;
+#include "Config/SCZ180_126.asm"
+;
+HBIOS_MUTEX	.SET	TRUE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
diff --git a/Source/HBIOS/Config/SCZ180_130_mtx.asm b/Source/HBIOS/Config/SCZ180_130_mtx.asm
new file mode 100644
index 00000000..99adaa91
--- /dev/null
+++ b/Source/HBIOS/Config/SCZ180_130_mtx.asm
@@ -0,0 +1,27 @@
+;
+;==================================================================================================
+;   SC130 STANDARD CONFIGURATION W/ HBIOS MUTEX
+;==================================================================================================
+;
+; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE
+; CFG_<PLT>.ASM INCLUDED FILE WHICH IS FOUND IN THE PARENT DIRECTORY.  THIS FILE CONTAINS
+; COMMON CONFIGURATION SETTINGS THAT OVERRIDE THE DEFAULTS.  IT IS INTENDED THAT YOU MAKE
+; YOUR CUSTOMIZATIONS IN THIS FILE AND JUST INHERIT ALL OTHER SETTINGS FROM THE DEFAULTS.
+; EVEN BETTER, YOU CAN MAKE A COPY OF THIS FILE WITH A NAME LIKE <PLT>_XXX.ASM AND SPECIFY
+; YOUR FILE IN THE BUILD PROCESS.
+;
+; THE SETTINGS BELOW ARE THE SETTINGS THAT ARE MOST COMMONLY MODIFIED FOR THIS PLATFORM.
+; MANY OF THEM ARE EQUAL TO THE SETTINGS IN THE INCLUDED FILE, SO THEY DON'T REALLY DO
+; ANYTHING AS IS.  THEY ARE LISTED HERE TO MAKE IT EASY FOR YOU TO ADJUST THE MOST COMMON
+; SETTINGS.
+;
+; N.B., SINCE THE SETTINGS BELOW ARE REDEFINING VALUES ALREADY SET IN THE INCLUDED FILE,
+; TASM INSISTS THAT YOU USE THE .SET OPERATOR AND NOT THE .EQU OPERATOR BELOW. ATTEMPTING
+; TO REDEFINE A VALUE WITH .EQU BELOW WILL CAUSE TASM ERRORS!
+;
+; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
+; DIRECTORIES ABOVE THIS ONE).
+;
+#include "Config/SCZ180_130.asm"
+;
+HBIOS_MUTEX	.SET	TRUE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile
index 354dcd26..d33fb0ae 100644
--- a/Source/HBIOS/Makefile
+++ b/Source/HBIOS/Makefile
@@ -14,7 +14,9 @@ OBJECTS += RCZ80_wiz.rom RCZ80_wiz.com
 OBJECTS += SBC_simh.rom SBC_simh.com
 OBJECTS += SBC_std.rom SBC_std.com 
 OBJECTS += SCZ180_126.rom SCZ180_126.com
+OBJECTS += SCZ180_126_mtx.rom SCZ180_126_mtx.com
 OBJECTS += SCZ180_130.rom SCZ180_130.com
+OBJECTS += SCZ180_130_mtx.rom SCZ180_130_mtx.com
 OBJECTS += UNA_std.rom
 OBJECTS += ZETA_std.rom ZETA_std.com
 OBJECTS += ZETA2_std.rom ZETA2_std.com
@@ -45,7 +47,7 @@ ROMSIZE=512
 N8_std.rom: ROMSIZE=512
 
 %.rom:
-	bash Build.sh $(DIFFBUILD) $(shell echo $* | tr '_' ' ') $(ROMSIZE)
+	bash Build.sh $(DIFFBUILD) $(shell echo $* | sed 's/_/ /') $(ROMSIZE)
 
 #ZETA2_std.rom:
 #	bash Build.sh ZETA2 std 512
diff --git a/Source/HBIOS/cfg_dyno.asm b/Source/HBIOS/cfg_dyno.asm
index 0babcf5d..8a9f251b 100644
--- a/Source/HBIOS/cfg_dyno.asm
+++ b/Source/HBIOS/cfg_dyno.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_DYNO	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ18
 CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_ezz80.asm b/Source/HBIOS/cfg_ezz80.asm
index d691eb2d..08a777d6 100644
--- a/Source/HBIOS/cfg_ezz80.asm
+++ b/Source/HBIOS/cfg_ezz80.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_EZZ80	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ1
 CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_master.asm b/Source/HBIOS/cfg_master.asm
index f02968d7..ea5d2680 100644
--- a/Source/HBIOS/cfg_master.asm
+++ b/Source/HBIOS/cfg_master.asm
@@ -14,6 +14,7 @@ PLATFORM	.EQU	PLT_SBC		; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ18
 CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_mk4.asm b/Source/HBIOS/cfg_mk4.asm
index 37025c1a..46f5301f 100644
--- a/Source/HBIOS/cfg_mk4.asm
+++ b/Source/HBIOS/cfg_mk4.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_MK4		; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ18
 CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_n8.asm b/Source/HBIOS/cfg_n8.asm
index 3592584b..29ce4a5c 100644
--- a/Source/HBIOS/cfg_n8.asm
+++ b/Source/HBIOS/cfg_n8.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_N8		; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ180
 CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_rcz180.asm b/Source/HBIOS/cfg_rcz180.asm
index aeb1f0c4..d430084c 100644
--- a/Source/HBIOS/cfg_rcz180.asm
+++ b/Source/HBIOS/cfg_rcz180.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_RCZ180	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ
 CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_rcz80.asm b/Source/HBIOS/cfg_rcz80.asm
index 3a49b4d3..59f86821 100644
--- a/Source/HBIOS/cfg_rcz80.asm
+++ b/Source/HBIOS/cfg_rcz80.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_RCZ80	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ1
 CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_sbc.asm b/Source/HBIOS/cfg_sbc.asm
index 78193630..ab54d396 100644
--- a/Source/HBIOS/cfg_sbc.asm
+++ b/Source/HBIOS/cfg_sbc.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_SBC		; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ18
 CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_scz180.asm b/Source/HBIOS/cfg_scz180.asm
index 532544d7..c37cc2d6 100644
--- a/Source/HBIOS/cfg_scz180.asm
+++ b/Source/HBIOS/cfg_scz180.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_SCZ180	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ
 CPUFAM		.EQU	CPU_Z180	; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_zeta.asm b/Source/HBIOS/cfg_zeta.asm
index d34cfdbb..85e7f731 100644
--- a/Source/HBIOS/cfg_zeta.asm
+++ b/Source/HBIOS/cfg_zeta.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_ZETA	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ18
 CPUFAM		.EQU	CPU_Z80		; CPU_[Z80|Z180]: CPU FAMILY
 BIOS		.EQU	BIOS_WBW	; BIOS_[WBW|UNA]: HARDWARE BIOS
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO] IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/cfg_zeta2.asm b/Source/HBIOS/cfg_zeta2.asm
index 44c6bdcd..19c48c62 100644
--- a/Source/HBIOS/cfg_zeta2.asm
+++ b/Source/HBIOS/cfg_zeta2.asm
@@ -17,6 +17,7 @@ PLATFORM	.EQU	PLT_ZETA2	; PLT_[SBC|ZETA|ZETA2|N8|MK4|UNA|RCZ80|RCZ180|EZZ80|SCZ1
 CPUFAM		.EQU	CPU_Z80		; CPU FAMILY: CPU_[Z80|Z180]
 BIOS		.EQU	BIOS_WBW	; HARDWARE BIOS: BIOS_[WBW|UNA]
 BATCOND		.EQU	FALSE		; ENABLE LOW BATTERY WARNING MESSAGE
+HBIOS_MUTEX	.EQU	FALSE		; PREVENT REENTRANT CALLS TO HBIOS (ADDS OVERHEAD)
 ;
 BOOTTYPE	.EQU	BT_MENU		; BT_[MENU|AUTO], IF AUTO, BOOT DEFAULT AFTER TIMEOUT
 BOOT_TIMEOUT	.EQU	20		; AUTO BOOT TIMEOUT IN SECONDS, 0 FOR IMMEDIATE BOOT
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 654d3739..b2416921 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -69,8 +69,6 @@
 ;
 #INCLUDE "std.asm"
 ;
-HBIOS_MUTEX	.EQU	TRUE
-;
 ; MAKE SURE EXACTLY ONE OF ROMBOOT, APPBOOT, IMGBOOT IS DEFINED.
 ;
 MODCNT	.EQU	0
@@ -553,6 +551,11 @@ HBX_INTSTKSIZ	.EQU	$FF00 - $
 		.FILL	HBX_INTSTKSIZ,$FF
 HBX_INTSTK	.EQU	$
 ;
+#IF (HBX_INTSTKSIZ < 24)
+	.ECHO	"*** ERROR: INTERRUPT STACK IS TOO SMALL!!!\n"
+	!!!	; FORCE AN ASSEMBLY ERROR
+#ENDIF
+;
 #IF (INTMODE == 2)
 ;
 ; HBIOS INTERRUPT SLOT ASSIGNMENTS
@@ -1316,6 +1319,14 @@ NXTMIO:	LD	A,(HL)
 ;
 	CALL	NEWLINE2
 	PRTX(STR_BANNER)
+;
+; DISPLAY HBIOS MUTEX ENABLED MESSAGE
+;
+#IF (HBIOS_MUTEX == TRUE)
+	CALL	NEWLINE
+	CALL	PRTSTRD
+	.TEXT	"HBIOS MUTEX ENABLED$"
+#ENDIF
 ;
 	DIAG(%11111111)
 ;
@@ -1408,8 +1419,6 @@ HB_SPDTST:
 ; DISPLAY MEMORY CONFIG
 ;
 	CALL	NEWLINE
-	;CALL	PRTSTRD
-	;.TEXT	"MEMORY CONFIG: $"
 	LD	HL,ROMSIZE
 	CALL	PRTDEC
 	CALL	PRTSTRD
@@ -4060,7 +4069,7 @@ HB_BATCOND	.DB	0		; BATTERY CONDITION (0=LOW, 1=OK)
 HB_BOOT_REC	.DB	0		; BOOT MODE (0=NORMAL, 1=RECOVERY MODE)
 #ENDIF
 ;
-STR_BANNER	.DB	"RetroBrew HBIOS v", BIOSVER, ", ", TIMESTAMP, "$"
+STR_BANNER	.DB	"RomWBW HBIOS v", BIOSVER, ", ", TIMESTAMP, "$"
 STR_PLATFORM	.DB	PLATFORM_NAME, "$"
 STR_SWITCH	.DB	"*** Activating CRT Console ***$"
 STR_BADINT	.DB	"\r\n*** BAD INT ***\r\n$"
diff --git a/Source/HBIOS/ver.inc b/Source/HBIOS/ver.inc
index 8320a3c2..67178022 100644
--- a/Source/HBIOS/ver.inc
+++ b/Source/HBIOS/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	9
 #DEFINE	RUP	2
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.33"
+#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/ZSDOS/ver.inc b/Source/ZSDOS/ver.inc
index 8320a3c2..67178022 100644
--- a/Source/ZSDOS/ver.inc
+++ b/Source/ZSDOS/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	9
 #DEFINE	RUP	2
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.33"
+#DEFINE BIOSVER	"2.9.2-pre.34"

From 1f6ef60599e603e80559cb1af37baeb906fafb31 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 11:36:17 -0800
Subject: [PATCH 2/8] IDE & PPIDE Cleanup

---
 Source/HBIOS/ide.asm   | 140 ++++++++++++++++++++++++++-------------
 Source/HBIOS/ppide.asm | 146 +++++++++++++++++++++++++++--------------
 2 files changed, 190 insertions(+), 96 deletions(-)

diff --git a/Source/HBIOS/ide.asm b/Source/HBIOS/ide.asm
index b2f771f3..c018384a 100644
--- a/Source/HBIOS/ide.asm
+++ b/Source/HBIOS/ide.asm
@@ -105,12 +105,6 @@
 ;	SRST:	SOFTWARE RESET
 ;	~IEN:	INTERRUPT ENABLE
 ;
-#IF (IDETRACE >= 3)
-#DEFINE		DCALL	CALL
-#ELSE
-#DEFINE		DCALL	\;
-#ENDIF
-;
 IDE_REG_DATA	.EQU	$00	; DATA 	/OUTPUT (R/W)
 IDE_REG_ERR	.EQU	$01	; ERROR REGISTER (R)
 IDE_REG_FEAT	.EQU	$01	; FEATURES REGISTER (W)
@@ -634,14 +628,18 @@ IDE_SETFEAT:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
 	.DB	IDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	POP	AF
 	;OUT	(IDE_IO_FEAT),A		; SET THE FEATURE VALUE
 	CALL	IDE_OUT
 	.DB	IDE_REG_FEAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	LD	A,IDE_CIDE_SETFEAT	; CMD = SETFEAT
 	LD	(IDE_CMD),A		; SAVE IT
 	JP	IDE_RUNCMD		; RUN COMMAND AND EXIT
@@ -657,8 +655,10 @@ IDE_IDENTIFY:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
 	.DB	IDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	LD	A,IDE_CIDE_IDDEV
 	LD	(IDE_CMD),A
 	CALL	IDE_RUNCMD
@@ -678,8 +678,10 @@ IDE_RDSEC:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
 	.DB	IDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,IDE_CIDE_READ
 	LD	(IDE_CMD),A
@@ -700,8 +702,10 @@ IDE_WRSEC:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
 	.DB	IDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,IDE_CIDE_WRITE
 	LD	(IDE_CMD),A
@@ -717,26 +721,34 @@ IDE_SETADDR:
 	; IDE_IO_LBA3 HAS ALREADY BEEN SET
 	; HSTLBA2-0 --> IDE_IO_LBA2-0
 	LD	A,(IY+IDE_LBA+2)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_OUT
 	.DB	IDE_REG_LBA2
 ;
 	LD	A,(IY+IDE_LBA+1)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_OUT
 	.DB	IDE_REG_LBA1
 ;
 	LD	A,(IY+IDE_LBA+0)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_OUT
 	.DB	IDE_REG_LBA0
 ;
 	LD	A,1
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	IDE_OUT
 	.DB	IDE_REG_COUNT
 ;
@@ -755,8 +767,10 @@ IDE_RUNCMD:
 	RET	NZ			; BAIL OUT ON TIMEOUT
 ;
 	LD	A,(IDE_CMD)		; GET THE COMMAND
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	;OUT	(IDE_IO_CMD),A		; SEND IT (STARTS EXECUTION)
 	CALL	IDE_OUT
 	.DB	IDE_REG_CMD
@@ -879,16 +893,20 @@ IDE_GETRES:
 	;IN	A,(IDE_IO_STAT)		; GET STATUS
 	CALL	IDE_IN
 	.DB	IDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	AND	%00000001		; ERROR BIT SET?
 	RET	Z			; NOPE, RETURN WITH ZF
 ;
 	;IN	A,(IDE_IO_ERR)		; READ ERROR REGISTER
 	CALL	IDE_IN
 	.DB	IDE_REG_ERR
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	OR	$FF			; FORCE NZ TO SIGNAL ERROR
 	RET				; RETURN
 ;
@@ -1076,8 +1094,10 @@ IDE_PROBE:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	IDE_OUT
 	.DB	IDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 
 	CALL	DELAY			; DELAY ~16US
 ;
@@ -1085,14 +1105,18 @@ IDE_PROBE:
 	;IN	A,(C)
 	CALL	IDE_IN
 	.DB	IDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$FF
 	JP	Z,IDE_NOMEDIA
 	CP	$78
 	JP	Z,IDE_NOMEDIA
 ;
-	DCALL	IDE_REGDUMP
+#IF (IDETRACE >= 3)
+	CALL	IDE_REGDUMP
+#ENDIF
 ;
 	;JR	IDE_PROBE1		; *DEBUG*
 ;
@@ -1100,44 +1124,64 @@ IDE_PROBE0:
 	CALL	IDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
 	JP	NZ,IDE_NOMEDIA		; CONVERT TIMEOUT TO NO MEDIA AND RETURN
 ;
-	DCALL	IDE_REGDUMP
+#IF (IDETRACE >= 3)
+	CALL	IDE_REGDUMP
+#ENDIF
 ;
 	; CHECK STATUS
 	;IN	A,(IDE_IO_STAT)		; GET STATUS
 	CALL	IDE_IN
 	.DB	IDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE		; IF DEBUG, PRINT STATUS
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE		; IF DEBUG, PRINT STATUS
+#ENDIF
 	OR	A			; SET FLAGS TO TEST FOR ZERO
 	JP	Z,IDE_NOMEDIA
 ;
 	; CHECK SIGNATURE
-	DCALL	PC_SPACE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(IDE_IO_COUNT)
 	CALL	IDE_IN
 	.DB	IDE_REG_COUNT
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$01
 	JP	NZ,IDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(IDE_IO_SECT)
 	CALL	IDE_IN
 	.DB	IDE_REG_SECT
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$01
 	JP	NZ,IDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(IDE_IO_CYLLO)
 	CALL	IDE_IN
 	.DB	IDE_REG_CYLLO
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$00
 	JP	NZ,IDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (IDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(IDE_IO_CYLHI)
 	CALL	IDE_IN
 	.DB	IDE_REG_CYLHI
-	DCALL	PRTHEXBYTE
+#IF (IDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$00
 	JP	NZ,IDE_NOMEDIA
 ;
@@ -1176,7 +1220,9 @@ IDE_INITDEV00:
 	RET	NZ			; BAIL OUT ON ERROR
 ;
 	LD	DE,HB_WRKBUF		; POINT TO BUFFER
-	DCALL	DUMP_BUFFER		; DUMP IT IF DEBUGGING
+#IF (IDETRACE >= 3)
+	CALL	DUMP_BUFFER		; DUMP IT IF DEBUGGING
+#ENDIF
 ;
 	XOR	A
 	LD	(IY+IDE_MED),0		; CLEAR FLAGS
diff --git a/Source/HBIOS/ppide.asm b/Source/HBIOS/ppide.asm
index 3cb48b86..637ed394 100644
--- a/Source/HBIOS/ppide.asm
+++ b/Source/HBIOS/ppide.asm
@@ -122,12 +122,6 @@ PPIDE_CTL_RESET	.EQU	%10000000	; DRIVE RESET (ACTIVE LOW, INVERTED)
 ;	SRST:	SOFTWARE RESET
 ;	~IEN:	INTERRUPT ENABLE
 ;
-#IF (PPIDETRACE >= 3)
-#DEFINE		DCALL	CALL
-#ELSE
-#DEFINE		DCALL	\;
-#ENDIF
-;
 ; CONTROL VALUES TO USE WHEN ACCESSING THE VARIOUS IDE DEVICE REGISTERS
 ;
 PPIDE_REG_DATA		.EQU	PPIDE_CTL_CS1 | $00	; DATA INPUT/OUTPUT (R/W)
@@ -445,8 +439,10 @@ PPIDE_DETECT:
 	XOR	A			; VALUE ZERO
 	OUT	(C),A			; PUSH VALUE TO PORT
 	IN	A,(C)			; GET PORT VALUE
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	OR	A			; SET FLAGS
 	RET				; AND RETURN
 ;
@@ -643,14 +639,18 @@ PPIDE_SETFEAT:
 	;OUT	(PPIDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	POP	AF
 	;OUT	(PPIDE_REG_FEAT),A	; SET THE FEATURE VALUE
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_FEAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	LD	A,PPIDE_CMD_SETFEAT	; CMD = SETFEAT
 	LD	(PPIDE_CMD),A		; SAVE IT
 	JP	PPIDE_RUNCMD		; RUN COMMAND AND EXIT
@@ -666,8 +666,10 @@ PPIDE_IDENTIFY:
 	;OUT	(PPIDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	LD	A,PPIDE_CMD_IDDEV
 	LD	(PPIDE_CMD),A
 	CALL	PPIDE_RUNCMD
@@ -687,8 +689,10 @@ PPIDE_RDSEC:
 	;OUT	(PPIDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,PPIDE_CMD_READ
 	LD	(PPIDE_CMD),A
@@ -709,8 +713,10 @@ PPIDE_WRSEC:
 	;OUT	(PPIDE_REG_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_SETADDR		; SETUP CYL, TRK, HEAD
 	LD	A,PPIDE_CMD_WRITE
 	LD	(PPIDE_CMD),A
@@ -726,26 +732,34 @@ PPIDE_SETADDR:
 	; IDE_IO_LBA3 HAS ALREADY BEEN SET
 	; HSTLBA2-0 --> IDE_IO_LBA2-0
 	LD	A,(IY+PPIDE_LBA+2)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_LBA2
 ;
 	LD	A,(IY+PPIDE_LBA+1)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_LBA1
 ;
 	LD	A,(IY+PPIDE_LBA+0)
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_LBA0
 ;
 	LD	A,1
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_COUNT
 ;
@@ -764,8 +778,10 @@ PPIDE_RUNCMD:
 	RET	NZ			; BAIL OUT ON TIMEOUT
 ;
 	LD	A,(PPIDE_CMD)		; GET THE COMMAND
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	;OUT	(PPIDE_REG_CMD),A	; SEND IT (STARTS EXECUTION)
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_CMD
@@ -930,16 +946,20 @@ PPIDE_GETRES:
 	;IN	A,(PPIDE_REG_STAT)	; READ STATUS
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	AND	%00000001		; ERROR BIT SET?
 	RET	Z			; NOPE, RETURN WITH ZF
 ;
 	;IN	A,(PPIDE_REG_ERR)	; READ ERROR REGISTER
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_ERR
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	OR	$FF			; FORCE NZ TO SIGNAL ERROR
 	RET				; RETURN
 ;
@@ -1048,8 +1068,10 @@ PPIDE_PROBE:
 	;OUT	(IDE_IO_DRVHD),A
 	CALL	PPIDE_OUT
 	.DB	PPIDE_REG_DRVHD
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 
 	CALL	DELAY			; DELAY ~16US
 ;
@@ -1068,12 +1090,16 @@ PPIDE_PROBE:
 ;	IN	A,(PPIDE_REG_STAT)	; GET STATUS
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE
+#ENDIF
 	OR	A
 	JP	Z,PPIDE_NOMEDIA
 ;
-	DCALL	PPIDE_REGDUMP
+#IF (PPIDETRACE >= 3)
+	CALL	PPIDE_REGDUMP
+#ENDIF
 ;
 	;JR	PPIDE_PROBE1		; *DEBUG*
 ;
@@ -1081,44 +1107,64 @@ PPIDE_PROBE0:
 	CALL	PPIDE_WAITBSY		; WAIT FOR BUSY TO CLEAR
 	JP	NZ,PPIDE_NOMEDIA	; CONVERT TIMEOUT TO NO MEDIA AND RETURN
 ;
-	DCALL	PPIDE_REGDUMP
+#IF (PPIDETRACE >= 3)
+	CALL	PPIDE_REGDUMP
+#ENDIF
 ;
 	; CHECK STATUS
 ;	IN	A,(PPIDE_REG_STAT)	; GET STATUS
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_STAT
-	DCALL	PC_SPACE
-	DCALL	PRTHEXBYTE		; IF DEBUG, PRINT STATUS
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+	CALL	PRTHEXBYTE		; IF DEBUG, PRINT STATUS
+#ENDIF
 	OR	A			; SET FLAGS TO TEST FOR ZERO
 	JP	Z,PPIDE_NOMEDIA		; CONTINUE IF NON-ZERO
 ;
 	; CHECK SIGNATURE
-	DCALL	PC_SPACE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(PPIDE_REG_COUNT)
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_COUNT
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$01
 	JP	NZ,PPIDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(PPIDE_REG_SECT)
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_SECT
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$01
 	JP	NZ,PPIDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(PPIDE_REG_CYLLO)
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_CYLLO
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$00
 	JP	NZ,PPIDE_NOMEDIA
-	DCALL	PC_SPACE
+#IF (PPIDETRACE >= 3)
+	CALL	PC_SPACE
+#ENDIF
 	;IN	A,(PPIDE_REG_CYLHI)
 	CALL	PPIDE_IN
 	.DB	PPIDE_REG_CYLHI
-	DCALL	PRTHEXBYTE
+#IF (PPIDETRACE >= 3)
+	CALL	PRTHEXBYTE
+#ENDIF
 	CP	$00
 	JP	NZ,PPIDE_NOMEDIA
 ;
@@ -1157,7 +1203,9 @@ PPIDE_INITDEV00:
 	RET	NZ			; BAIL OUT ON ERROR
 ;
 	LD	DE,HB_WRKBUF		; POINT TO BUFFER
-	DCALL	DUMP_BUFFER		; DUMP IT IF DEBUGGING
+#IF (PPIDETRACE >= 3)
+	CALL	DUMP_BUFFER		; DUMP IT IF DEBUGGING
+#ENDIF
 ;
 	LD	(IY+PPIDE_MED),0	; CLEAR MEDIA FLAGS
 ;

From 2c2df76f15d4c20d8ca78bd5337035f4c5364957 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 14:23:55 -0800
Subject: [PATCH 3/8] Clean up

Make version include files common.
---
 Source/CBIOS/cbios.asm     | 2 +-
 Source/CPM22/loader.asm    | 2 +-
 Source/CPM22/ver.inc       | 5 -----
 Source/CPM3/Build.cmd      | 3 ++-
 Source/CPM3/Makefile       | 2 ++
 Source/CPM3/boot.z80       | 2 +-
 Source/CPM3/loader.asm     | 2 +-
 Source/CPM3/ver.inc        | 7 -------
 Source/HBIOS/std.asm       | 2 +-
 Source/HBIOS/ver.inc       | 5 -----
 Source/ZPM3/loader.asm     | 2 +-
 Source/ZSDOS/loader.asm    | 2 +-
 Source/ZSDOS/ver.inc       | 5 -----
 Source/{CBIOS => }/ver.inc | 0
 14 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 Source/CPM22/ver.inc
 delete mode 100644 Source/CPM3/ver.inc
 delete mode 100644 Source/HBIOS/ver.inc
 delete mode 100644 Source/ZSDOS/ver.inc
 rename Source/{CBIOS => }/ver.inc (100%)

diff --git a/Source/CBIOS/cbios.asm b/Source/CBIOS/cbios.asm
index aa245aae..065e81e2 100644
--- a/Source/CBIOS/cbios.asm
+++ b/Source/CBIOS/cbios.asm
@@ -50,7 +50,7 @@ DEF_IOBYTE	.EQU	%10010100	; DEFAULT IOBYTE VALUE
 DEV_BAT		.EQU	$FE		; BAT:
 DEV_NUL		.EQU	$FF		; NUL:
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 #INCLUDE "config.asm"
 ;
diff --git a/Source/CPM22/loader.asm b/Source/CPM22/loader.asm
index 93cac556..72febbef 100644
--- a/Source/CPM22/loader.asm
+++ b/Source/CPM22/loader.asm
@@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$E600		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$D000		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
diff --git a/Source/CPM22/ver.inc b/Source/CPM22/ver.inc
deleted file mode 100644
index 67178022..00000000
--- a/Source/CPM22/ver.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/CPM3/Build.cmd b/Source/CPM3/Build.cmd
index 003bd7eb..1d0e1a9c 100644
--- a/Source/CPM3/Build.cmd
+++ b/Source/CPM3/Build.cmd
@@ -9,7 +9,8 @@ set TASMTABS=%TOOLS%\tasm32
 
 set ZXBINDIR=%TOOLS%/cpm/bin/
 set ZXLIBDIR=%TOOLS%/cpm/lib/
-set ZXINCDIR=%TOOLS%/cpm/include/
+rem set ZXINCDIR=%TOOLS%/cpm/include/
+set ZXINCDIR=../
 
 echo.
 echo.
diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index 8d8b4b73..c50b7ac6 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -11,6 +11,8 @@ OTHERS += biosldrc.rel biosldrd.rel
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
+export ZXINCDIR := ../
+
 BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel 
 BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel
 COMMA := ,
diff --git a/Source/CPM3/boot.z80 b/Source/CPM3/boot.z80
index 99c7bbda..38418b3a 100644
--- a/Source/CPM3/boot.z80
+++ b/Source/CPM3/boot.z80
@@ -16,7 +16,7 @@
 	extrn	addhla, bcd2bin, bin2bcd
 	;extrn	cout, phex8
 	
-	include	ver.inc
+	include	c:ver.lib
 	
 bdos	equ 5
 
diff --git a/Source/CPM3/loader.asm b/Source/CPM3/loader.asm
index 982f7205..979ef532 100644
--- a/Source/CPM3/loader.asm
+++ b/Source/CPM3/loader.asm
@@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$0100		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$0100		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
diff --git a/Source/CPM3/ver.inc b/Source/CPM3/ver.inc
deleted file mode 100644
index 9f3f8d3b..00000000
--- a/Source/CPM3/ver.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-rmj	equ	2
-rmn	equ	9
-rup	equ	2
-rtp	equ	0
-biosver	macro
-	db	"2.9.2-pre.34"
-	endm
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index 89f5fcfd..ab865447 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -18,7 +18,7 @@
 ;
 ; INCLUDE VERSION
 ;
-#INCLUDE "ver.inc"			; ADD BIOSVER
+#INCLUDE "../ver.inc"			; ADD BIOSVER
 ;
 FALSE		.EQU 	0
 TRUE		.EQU 	~FALSE
diff --git a/Source/HBIOS/ver.inc b/Source/HBIOS/ver.inc
deleted file mode 100644
index 67178022..00000000
--- a/Source/HBIOS/ver.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/ZPM3/loader.asm b/Source/ZPM3/loader.asm
index 982f7205..979ef532 100644
--- a/Source/ZPM3/loader.asm
+++ b/Source/ZPM3/loader.asm
@@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "../HBIOS/ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$0100		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$0100		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
diff --git a/Source/ZSDOS/loader.asm b/Source/ZSDOS/loader.asm
index 27dc735c..74f2a6b7 100644
--- a/Source/ZSDOS/loader.asm
+++ b/Source/ZSDOS/loader.asm
@@ -25,7 +25,7 @@
 ;
 ;===============================================================================
 ;
-#INCLUDE "ver.inc"
+#INCLUDE "../ver.inc"
 ;
 SYS_ENT		.EQU	$E600		; SYSTEM (OS) ENTRY POINT ADDRESS
 SYS_LOC		.EQU	$D000		; STARTING ADDRESS TO LOAD SYSTEM IMAGE
diff --git a/Source/ZSDOS/ver.inc b/Source/ZSDOS/ver.inc
deleted file mode 100644
index 67178022..00000000
--- a/Source/ZSDOS/ver.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#DEFINE	RMJ	2
-#DEFINE	RMN	9
-#DEFINE	RUP	2
-#DEFINE	RTP	0
-#DEFINE BIOSVER	"2.9.2-pre.34"
diff --git a/Source/CBIOS/ver.inc b/Source/ver.inc
similarity index 100%
rename from Source/CBIOS/ver.inc
rename to Source/ver.inc

From 02c051f47c8e3793938f68fe338f212ecda240eb Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 14:56:48 -0800
Subject: [PATCH 4/8] Update Makefile

---
 Source/CPM3/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index c50b7ac6..bfb4d5f3 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -11,7 +11,8 @@ OTHERS += biosldrc.rel biosldrd.rel
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
-export ZXINCDIR := ../
+ZXINCDIR = ../
+export ZXINCDIR
 
 BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel 
 BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel

From 86765620d7c4272b824842bc01342454a14c8a49 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 15:55:30 -0800
Subject: [PATCH 5/8] Update Makefile

---
 Source/CPM3/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index bfb4d5f3..941f4cd9 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -28,6 +28,7 @@ clean:: biosclean
 	@rm -f bios3.spr bnkbios3.spr zpmbios3.spr cpmldr.com gencpm.dat options.lib ldropts.lib
 
 biosclean:
+	printenv
 	@rm -f $(BIOSOBJS)
 
 cpm3res:

From 9fe50047567379805cbc4e0478f814e681e614a8 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 16:40:47 -0800
Subject: [PATCH 6/8] Build Test

---
 Source/CPM3/Makefile | 1 -
 Tools/unix/zx/zx.c   | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index 941f4cd9..bfb4d5f3 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -28,7 +28,6 @@ clean:: biosclean
 	@rm -f bios3.spr bnkbios3.spr zpmbios3.spr cpmldr.com gencpm.dat options.lib ldropts.lib
 
 biosclean:
-	printenv
 	@rm -f $(BIOSOBJS)
 
 cpm3res:
diff --git a/Tools/unix/zx/zx.c b/Tools/unix/zx/zx.c
index 0ea315d0..c460a1b5 100644
--- a/Tools/unix/zx/zx.c
+++ b/Tools/unix/zx/zx.c
@@ -317,6 +317,10 @@ int main(int ac, char **av)
 		fprintf(stderr, "Could not initialise CPMREDIR library\n");
 		zx_exit(1);
 	}
+	
+	printf("BINDIR80='%s'\n", BINDIR80);
+	printf("LIBDIR80='%s'\n", LIBDIR80);
+	printf("INCDIR80='%s'\n", INCDIR80);
 
 	xlt_map(0, BINDIR80);	/* Establish the 3 fixed mappings */
 	xlt_map(1, LIBDIR80);

From 490c865ea196edf0ba20f84555114421a1359866 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 16:56:27 -0800
Subject: [PATCH 7/8] Build Test

---
 .gitignore     | 1 +
 Source/ver.lib | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 Source/ver.lib

diff --git a/.gitignore b/.gitignore
index ff0adf6b..4782ed5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,7 @@ Tools/unix/uz80as/uz80as
 Tools/unix/zx/config.h
 Tools/unix/zx/zx
 
+!Source/ver.lib
 !Source/Apps/FAT/FAT.COM
 !Source/BPBIOS/bpbuild.com
 !Source/BPBIOS/movp112.com
diff --git a/Source/ver.lib b/Source/ver.lib
new file mode 100644
index 00000000..9f3f8d3b
--- /dev/null
+++ b/Source/ver.lib
@@ -0,0 +1,7 @@
+rmj	equ	2
+rmn	equ	9
+rup	equ	2
+rtp	equ	0
+biosver	macro
+	db	"2.9.2-pre.34"
+	endm

From 83db582b924b97a52c741315e94bad7c3fe315aa Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Fri, 6 Mar 2020 17:21:48 -0800
Subject: [PATCH 8/8] Build Fixes

---
 Source/CPM3/Makefile | 3 +--
 Tools/unix/zx/zx.c   | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/CPM3/Makefile b/Source/CPM3/Makefile
index bfb4d5f3..4eb2a352 100644
--- a/Source/CPM3/Makefile
+++ b/Source/CPM3/Makefile
@@ -11,8 +11,7 @@ OTHERS += biosldrc.rel biosldrd.rel
 TOOLS = ../../Tools
 include $(TOOLS)/Makefile.inc
 
-ZXINCDIR = ../
-export ZXINCDIR
+export ZXINCDIR = ../
 
 BIOSOBJS = bioskrnl.rel scb.rel boot.rel chario.rel 
 BIOSOBJS += move.rel drvtbl.rel diskio.rel util.rel
diff --git a/Tools/unix/zx/zx.c b/Tools/unix/zx/zx.c
index c460a1b5..0ea315d0 100644
--- a/Tools/unix/zx/zx.c
+++ b/Tools/unix/zx/zx.c
@@ -317,10 +317,6 @@ int main(int ac, char **av)
 		fprintf(stderr, "Could not initialise CPMREDIR library\n");
 		zx_exit(1);
 	}
-	
-	printf("BINDIR80='%s'\n", BINDIR80);
-	printf("LIBDIR80='%s'\n", LIBDIR80);
-	printf("INCDIR80='%s'\n", INCDIR80);
 
 	xlt_map(0, BINDIR80);	/* Establish the 3 fixed mappings */
 	xlt_map(1, LIBDIR80);