Finalize Pre-release 34

Final support for FreeRTOS
6 years ago · 1831141abd
22 changed files with 89 additions and 12 deletions
--- 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
 -------------
--- 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 
--- 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"
--- 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"
--- 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
--- a/Source/HBIOS/Config/SCZ180_126_mtx.asm
+++ 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)
--- a/Source/HBIOS/Config/SCZ180_130_mtx.asm
+++ 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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$"
--- 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"
--- 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"