Build changes as discussed with WW and documented in Issue 451

Source/Build.cmd

@@ -5,8 +5,8 @@ setlocal
 call BuildProp || exit /b
 call BuildShared || exit /b
 call BuildBP || exit /b
-call BuildROM %* || exit /b
 call BuildImages || exit /b
+call BuildROM %* || exit /b
 call BuildZRC || exit /b
 call BuildZ1RCC || exit /b
 call BuildZZRCC || exit /b
@@ -15,4 +15,4 @@ call BuildFZ80 || exit /b
 
 if "%1" == "dist" (
   call Clean || exit /b
-)
+)

Source/HBIOS/Build.cmd

@@ -89,10 +89,9 @@ call :asm usrrom || exit /b
 call :asm updater || exit /b
 call :asm imgpad2 || exit /b
 
-::
-:: Build components in Sub folders
-::
-pushd SysConfig && call Build || exit /b & popd
+:: Sysconf builds as both BIN and COM files
+tasm -t%CPUType% -g3 -fFF -dROMWBW sysconf.asm sysconf.bin sysconf_bin.lst || exit /b
+tasm -t%CPUType% -g3 -fFF -dCPM sysconf.asm sysconf.com sysconf_com.lst || exit /b
 
 ::
 :: Create additional ROM bank images by assembling components into
@@ -102,7 +101,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 + sysconf.bin + usrrom.bin osimg1.bin || exit /b
 
 if %Platform%==S100 (
     zxcc slr180 -s100mon/fh
@@ -158,6 +157,8 @@ if exist %ROMName%.rom copy %ROMName%.rom ..\..\Binary || exit /b
 if exist %ROMName%.upd copy %ROMName%.upd ..\..\Binary || exit /b
 if exist %ROMName%.com copy %ROMName%.com ..\..\Binary || exit /b
 
+if exist sysconf.com copy sysconf.com ..\..\Binary\Apps\ || exit /b
+
 goto :eof
 
 ::

Source/HBIOS/Clean.cmd

@@ -16,5 +16,3 @@ 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,11 +3,9 @@ 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
 DEST = ../../Binary
 TOOLS =../../Tools
-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
+OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh
 
 # DIFFMAKE = 1
 
@@ -34,7 +32,7 @@ else ifeq ($(CPUFAM),3)
 	TASM=$(BINDIR)/uz80as -t z280
 endif
 
-DEPS=prereq dbgmon.bin romldr.bin nascom.bin tastybasic.bin game.bin eastaegg.bin updater.bin usrrom.bin imgpad2.bin
+DEPS=prereq dbgmon.bin romldr.bin nascom.bin tastybasic.bin game.bin eastaegg.bin updater.bin sysconf.bin usrrom.bin imgpad2.bin
 
 ifeq ($(ROM_PLATFORM),UNA)
 	ROMDEPS=romldr.bin dbgmon.bin
@@ -63,7 +61,7 @@ $(OBJECTS) : $(ROMDEPS)
 	@cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin ../CPM22/cpm_$(BIOS).bin >osimg.bin
 	cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin >osimg_small.bin
 	if [ $(ROM_PLATFORM) != UNA ] ; then \
-		cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin SysConfig/sysconfig.bin usrrom.bin >osimg1.bin ; \
+		cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin sysconf.bin usrrom.bin >osimg1.bin ; \
 		if [ $(ROM_PLATFORM) = S100 ] ; then \
 			cat s100mon.bin >osimg2.bin ; \
 		else \
@@ -89,7 +87,7 @@ $(OBJECTS) : $(ROMDEPS)
 		fi \
 	fi
 
-prereq: $(FONTS) camel80.bin tastybasic.bin syscon
+prereq: $(FONTS) camel80.bin tastybasic.bin
 
 font%.asm:
 	cp ../Fonts/$@ .
@@ -97,8 +95,11 @@ font%.asm:
 camel80.bin:
 	cp ../Forth/$@ .
 
-syscon:
-	$(MAKE) --directory SysConfig
+sysconf.bin:
+	@$(TASM) -dROMWBW sysconf.asm sysconf.bin sysconf_bin.lst
+
+sysconf.com:
+	@$(TASM) -dCPM sysconf.asm sysconf.com sysconf_com.lst
 
 s100mon.bin:
 	$(ZXCC) $(CPM)/SLR180 -s100mon/FH

Source/HBIOS/Makefile.new

@@ -41,9 +41,6 @@ camel80.bin:
 tastybasic.bin:
 	cp ../TastyBasic/src/$@ .
 
-sysconfig.bin:
-	cp SysConfig/$@ .
-
 s100mon.bin:
 	$(ZXCC) $(CPM)/SLR180 -s100mon/FH
 	$(ZXCC) $(CPM)/MLOAD25 -s100mon.bin=s100mon
@@ -103,8 +100,8 @@ UNA_%.osimg.bin: UNA_%.romldr.bin UNA_%.dbgmon.bin
 %.osimg_small.bin: %.romldr.bin %.dbgmon.bin
 	cat $(*F).romldr.bin $(*F).dbgmon.bin ../ZSDOS/zsys_wbw.bin >$@
 
-%.osimg1.bin: camel80.bin %.nascom.bin tastybasic.bin %.game.bin %.eastaegg.bin netboot.mod %.updater.bin sysconfig.bin %.usrrom.bin
-	cat camel80.bin $(*F).nascom.bin tastybasic.bin $(*F).game.bin $(*F).eastaegg.bin netboot.mod $(*F).updater.bin sysconfig.bin $(*F).usrrom.bin >$@
+%.osimg1.bin: camel80.bin %.nascom.bin tastybasic.bin %.game.bin %.eastaegg.bin netboot.mod %.updater.bin sysconf.bin %.usrrom.bin
+	cat camel80.bin $(*F).nascom.bin tastybasic.bin $(*F).game.bin $(*F).eastaegg.bin netboot.mod $(*F).updater.bin sysconf.bin $(*F).usrrom.bin >$@
 	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
 
 S100_%.imgpad2.bin: s100mon.bin

Source/HBIOS/SysConfig/Build.cmd

@@ -1,11 +0,0 @@
-@echo off
-setlocal
-
-set TOOLS=../../../Tools
-set PATH=%TOOLS%\tasm32;%PATH%
-set TASMTABS=%TOOLS%\tasm32
-
-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

Source/HBIOS/SysConfig/Clean.cmd

@@ -1,6 +0,0 @@
-@echo off
-setlocal
-
-if exist *.com del *.com
-if exist *.lst del *.lst
-if exist *.bin del *.bin

Source/HBIOS/SysConfig/Makefile

@@ -1,12 +0,0 @@
-OBJECTS = sysconfig.com sysconfig.bin
-DEST = ../../../Binary/Apps
-NOCOPY = sysconfig.bin
-TOOLS = ../../../Tools
-
-include $(TOOLS)/Makefile.inc
-
-USETASM=1
-
-sysconfig.bin: TASMFLAGS=-dROMWBW
-
-sysconfig.com: TASMFLAGS=-dCPM

Source/HBIOS/SysConfig/README.md

@@ -1,21 +0,0 @@
-# System Configuration
-
-## Introduction
-
-An utility applicaton that sets NVR Attributes that affect HBIOS and 
-RomWBW Operation. Write to RTC NVRAM to store config is reliant on HBIOS
-
-## Building
-
-TASM (Telemark Assembler) ([Anderson, 1998](##References)).
-
-### RomWBW Version
-
-Is part of the SBCv2 RomWBW distribution. And deployed as a Rom Application
-It is included in Rom Bank 1
-
-### CP/M Version
-
-The resulting `sysconfig.com` command file can be run in CP/M.
-It is copied in the Binary/Apps folder.
-

Source/HBIOS/SysConfig/sysconfig.asm → Source/HBIOS/sysconf.asm

@@ -20,8 +20,8 @@
 ; Also Based on The Tasty Basic Configuration
 ; Utilitity function were also copied from RomLdr, Assign.
 ;
-#include "../../ver.inc"
-#include "../hbios.inc"
+#include "../ver.inc"
+#include "hbios.inc"
 ;
 ;=======================================================================
 ;
@@ -33,7 +33,7 @@ NVR_LOC		.equ	0100h
 #ifdef ROMWBW
 ;
 #define PLATFORM "ROMWBW"
-#include "../layout.inc"
+#include "layout.inc"
 #endif
 ;
 ;=======================================================================
@@ -275,6 +275,7 @@ PRT_STATUS:
 ; end individual stats
 ;
 	CALL	prtcrlf
+	XOR	A			; success
 	RET
 ;
 ; Error status handling

Source/Images/hd_bp.txt

@@ -24,7 +24,6 @@
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:

Source/Images/hd_cpm22.txt

@@ -20,7 +20,6 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:

Source/Images/hd_cpm3.txt

@@ -39,7 +39,6 @@ d_cpm3/ReadMe.txt 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 #../../Binary/Apps/sysgen.com 0:
 #../../Binary/Apps/talk.com 0:

Source/Images/hd_nzcom.txt

@@ -35,7 +35,6 @@ d_zsdos/u0/*.DAT 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:

Source/Images/hd_qpm.txt

@@ -24,7 +24,6 @@ d_cpm22/u0/*.* 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:

Source/Images/hd_z3plus.txt

@@ -46,7 +46,6 @@ d_cpm3/u0/HELP.HLP 0:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:

Source/Images/hd_zpm3.txt

@@ -45,7 +45,6 @@ d_cpm3/u0/HELP.HLP 0:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
-../../Binary/Apps/sysconfig.com 15:
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:

Source/Images/hd_zsdos.txt

@@ -24,7 +24,6 @@ d_cpm22/u0/*.* 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
-../../Binary/Apps/sysconfig.com 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:

Source/Makefile

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