Follow up to Initial NVRAM Changes

See notes in Issue #451

Doc/ChangeLog.txt

@@ -47,6 +47,7 @@ Version 3.5
 - MAP: Significant improvement in Disk Catalog document
 - MAP: Added Disk Image for the Z3PLUS (Z-System for CP/M-Plus) os.
 - H?H: Fix XModem 12.3 WRERR to put CAN char in proper register to send.
+- MAP: Initial NVRAM configuration infrastructure
 
 Version 3.4
 -----------

Source/Build.cmd

@@ -5,8 +5,8 @@ setlocal
 call BuildProp || exit /b
 call BuildShared || exit /b
 call BuildBP || exit /b
-call BuildImages || exit /b
 call BuildROM %* || exit /b
+call BuildImages || exit /b
 call BuildZRC || exit /b
 call BuildZ1RCC || exit /b
 call BuildZZRCC || exit /b

Source/HBIOS/Build.cmd

@@ -102,7 +102,7 @@ pushd SysConfig && call Build || exit /b & popd
 ::
 
 copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b
-copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + SysConfig/sysconfig.bin usrrom.bin osimg1.bin || exit /b
+copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + SysConfig\sysconfig.bin + usrrom.bin osimg1.bin || exit /b
 
 if %Platform%==S100 (
     zxcc slr180 -s100mon/fh

Source/HBIOS/Clean.cmd

@@ -16,3 +16,5 @@ if exist build.inc del build.inc
 if exist font*.asm del font*.asm
 if exist build_env.cmd del build_env.cmd
 if exist hbios_env.cmd del hbios_env.cmd
+
+pushd SysConfig && call Clean & popd

Source/HBIOS/Makefile

@@ -3,10 +3,11 @@ MOREDIFF = game.bin hbios_rom.bin nascom.bin usrrom.bin \
 	dbgmon.bin hbios_app.bin imgpad2.bin osimg1.bin osimg2.bin romldr.bin \
 	eastaegg.bin hbios_img.bin osimg.bin game.bin updater.bin usrrom.bin
 
-SUBDIRS = SysConfig
+# SUBDIRS = SysConfig
 DEST = ../../Binary
 TOOLS =../../Tools
-OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh
+OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh \
+	SysConfig/*.com SysConfig/*.bin Sysconfig/*.lst
 
 # DIFFMAKE = 1
 
@@ -88,7 +89,7 @@ $(OBJECTS) : $(ROMDEPS)
 		fi \
 	fi
 
-prereq: $(FONTS) camel80.bin tastybasic.bin
+prereq: $(FONTS) camel80.bin tastybasic.bin syscon
 
 font%.asm:
 	cp ../Fonts/$@ .
@@ -96,6 +97,9 @@ font%.asm:
 camel80.bin:
 	cp ../Forth/$@ .
 
+syscon:
+	$(MAKE) --directory SysConfig
+
 s100mon.bin:
 	$(ZXCC) $(CPM)/SLR180 -s100mon/FH
 	$(ZXCC) $(CPM)/MLOAD25 -s100mon.bin=s100mon

Source/HBIOS/SysConfig/Build.cmd

@@ -1,10 +1,11 @@
 @echo off
 setlocal
 
-set TOOLS=../../Tools
+set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t80 -g3 -fFF sysconfig.asm sysconfig.com sysconfig.lst || exit /b
+tasm -t80 -g3 -fFF -dCPM sysconfig.asm sysconfig.com sysconfig.lst || exit /b
+tasm -t80 -g3 -fFF -dROMWBW sysconfig.asm sysconfig.bin sysconfig.lst || exit /b
 
-copy /Y sysconfig.com ..\..\Binary\Apps\ || exit /b
+copy /Y sysconfig.com ..\..\..\Binary\Apps\ || exit /b

Source/HBIOS/SysConfig/sysconfig.asm

@@ -125,13 +125,13 @@ initz:
 ;
 err_una:
 	ld	de,str_err_una
-	jr	err_ret
+	jp	err_ret
 err_inv:
 	ld	de,str_err_inv
-	jr	err_ret
+	jp	err_ret
 err_ver:
 	ld	de,str_err_ver
-	jr	err_ret
+	jp	err_ret
 ;
 str_err_una		.db	"  ERROR: UNA not supported by application",0
 str_err_inv		.db	"  ERROR: Invalid BIOS (signature missing)",0
@@ -377,8 +377,8 @@ MSG_DEFBOOT	.DB	CR,LF, "  [DB] / Default Boot: ",0
 MSG_DISK	.DB	"Disk (Unit = ",0
 MSG_DISK2	.DB	", Slice = ",0
 MSG_DISK3	.DB	")",0
-MSG_ROM		.DB	"ROM (App = '",0
+MSG_ROM		.DB	"ROM (App = \"",0
-MSG_ROM2	.DB	"')",0
+MSG_ROM2	.DB	"\")",0
 ;
 MSG_DEFB_H	.DB	"\r\nDefault Boot - Disk or Rom App (DB):\r\n"
 		.DB	"  DB [R|D],[{romapp}|{unit},{slice}]\r\n"

Source/HBIOS/cfg_DUO.asm

@@ -318,7 +318,7 @@ ESPCONENABLE	.SET	TRUE		; ESP: ENABLE ESP32 CONSOLE IO DRIVER VIDEO/KBD SUPPORT
 HDSKENABLE	.SET	FALSE		; HDSK: ENABLE SIMH HDSK DISK DRIVER (HDSK.ASM)
 HDSKTRACE	.SET	1		; HDSK: TRACE LEVEL (0=NO,1=ERRORS,2=ALL)
 ;
-PIOENABLE	.SET	TRUE		; PIO: ENABLE ZILOG PIO DRIVER (PIO.ASM)
+PIOENABLE	.SET	FALSE		; PIO: ENABLE ZILOG PIO DRIVER (PIO.ASM)
 PIOCNT		.SET	2		; PIO: NUMBER OF CHIPS TO DETECT (1-2), 2 CHANNELS PER CHIP
 PIO0BASE	.SET	$68		; PIO 0: REGISTERS BASE ADR
 PIO1BASE	.SET	$6C		; PIO 1: REGISTERS BASE ADR

Source/HBIOS/hbios.asm

@@ -1497,6 +1497,7 @@ BOOTWAIT:
 	LD	A,RPH_DEFACR		; ENSURE RPH ACR
 	OUT0	(RPH_ACR),A		; ... REGISTER IS INITIALIZED
 #ENDIF
+
 ;
 ; INITIALIZE DIAGNOSTIC AND/OR FRONT PANEL LED(S) TO INDICATE THE
 ; SYSTEM IS ALIVE. WE HAVE NO RAM AT THIS TIME, SO WE CANNOT USE
@@ -1515,6 +1516,7 @@ BOOTWAIT:
 
 #ENDIF
 ;
+
 #IF (LEDENABLE)
   #IF ((LEDMODE == LEDMODE_STD) | (LEDMODE == LEDMODE_SC))
 	XOR	A			; LED IS INVERTED, TURN IT ON
@@ -5702,7 +5704,7 @@ SYS_GETSWITCH:
 ;
 	LD	A,D
 	CP	$FF			; test if want to just get NVRAM status
-	JR	Z,NVSW_STATUS		; Check the Status - Call and Return
+	JP	Z,NVSW_STATUS		; Check the Status - Call and Return
 ;
 	CALL	SWITCH_RES		; D SWITCH NUMBER -> OUT HL address, E FLAGS
 	RET	NZ			; IF NZ FLAG SET THEN ISSUE

Source/Makefile

@@ -7,7 +7,7 @@
 .ONESHELL:
 .SHELLFLAGS = -ce
 
-all: prop shared bp images rom zrc z1rcc zzrcc zrc512 fz80
+all: prop shared bp rom images zrc z1rcc zzrcc zrc512 fz80
 
 doc:
 	$(MAKE) --directory Doc $(ACTION)