From f6ef90fe14ff48f6509e5a6cecad1efafb9ab6b2 Mon Sep 17 00:00:00 2001 From: Mark Pruden Date: Fri, 15 Nov 2024 22:10:04 +1100 Subject: [PATCH] Build changes as discussed with WW and documented in Issue 451 --- Source/Build.cmd | 4 ++-- Source/HBIOS/Build.cmd | 11 +++++----- Source/HBIOS/Clean.cmd | 2 -- Source/HBIOS/Makefile | 17 ++++++++------- Source/HBIOS/Makefile.new | 7 ++----- Source/HBIOS/SysConfig/Build.cmd | 11 ---------- Source/HBIOS/SysConfig/Clean.cmd | 6 ------ Source/HBIOS/SysConfig/Makefile | 12 ----------- Source/HBIOS/SysConfig/README.md | 21 ------------------- .../{SysConfig/sysconfig.asm => sysconf.asm} | 7 ++++--- Source/Images/hd_bp.txt | 1 - Source/Images/hd_cpm22.txt | 1 - Source/Images/hd_cpm3.txt | 1 - Source/Images/hd_nzcom.txt | 1 - Source/Images/hd_qpm.txt | 1 - Source/Images/hd_z3plus.txt | 1 - Source/Images/hd_zpm3.txt | 1 - Source/Images/hd_zsdos.txt | 1 - Source/Makefile | 2 +- 19 files changed, 24 insertions(+), 84 deletions(-) delete mode 100644 Source/HBIOS/SysConfig/Build.cmd delete mode 100644 Source/HBIOS/SysConfig/Clean.cmd delete mode 100644 Source/HBIOS/SysConfig/Makefile delete mode 100644 Source/HBIOS/SysConfig/README.md rename Source/HBIOS/{SysConfig/sysconfig.asm => sysconf.asm} (99%) diff --git a/Source/Build.cmd b/Source/Build.cmd index b0d0b750..7626a350 100644 --- a/Source/Build.cmd +++ b/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 -) \ No newline at end of file +) diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd index 88a3c701..f85df9d3 100644 --- a/Source/HBIOS/Build.cmd +++ 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 :: diff --git a/Source/HBIOS/Clean.cmd b/Source/HBIOS/Clean.cmd index 94b8d008..a291a724 100644 --- a/Source/HBIOS/Clean.cmd +++ b/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 diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index 4370db84..971d6432 100644 --- a/Source/HBIOS/Makefile +++ b/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 diff --git a/Source/HBIOS/Makefile.new b/Source/HBIOS/Makefile.new index 21191551..c12b94bc 100644 --- a/Source/HBIOS/Makefile.new +++ b/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 diff --git a/Source/HBIOS/SysConfig/Build.cmd b/Source/HBIOS/SysConfig/Build.cmd deleted file mode 100644 index 3b609070..00000000 --- a/Source/HBIOS/SysConfig/Build.cmd +++ /dev/null @@ -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 diff --git a/Source/HBIOS/SysConfig/Clean.cmd b/Source/HBIOS/SysConfig/Clean.cmd deleted file mode 100644 index f408cf0e..00000000 --- a/Source/HBIOS/SysConfig/Clean.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -setlocal - -if exist *.com del *.com -if exist *.lst del *.lst -if exist *.bin del *.bin diff --git a/Source/HBIOS/SysConfig/Makefile b/Source/HBIOS/SysConfig/Makefile deleted file mode 100644 index c44a90e0..00000000 --- a/Source/HBIOS/SysConfig/Makefile +++ /dev/null @@ -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 diff --git a/Source/HBIOS/SysConfig/README.md b/Source/HBIOS/SysConfig/README.md deleted file mode 100644 index e9269771..00000000 --- a/Source/HBIOS/SysConfig/README.md +++ /dev/null @@ -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. - diff --git a/Source/HBIOS/SysConfig/sysconfig.asm b/Source/HBIOS/sysconf.asm similarity index 99% rename from Source/HBIOS/SysConfig/sysconfig.asm rename to Source/HBIOS/sysconf.asm index 8bc48ae9..866c97b5 100644 --- a/Source/HBIOS/SysConfig/sysconfig.asm +++ b/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 diff --git a/Source/Images/hd_bp.txt b/Source/Images/hd_bp.txt index 0db9f373..099aa264 100644 --- a/Source/Images/hd_bp.txt +++ b/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: diff --git a/Source/Images/hd_cpm22.txt b/Source/Images/hd_cpm22.txt index cacbf227..99ab40c2 100644 --- a/Source/Images/hd_cpm22.txt +++ b/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: diff --git a/Source/Images/hd_cpm3.txt b/Source/Images/hd_cpm3.txt index 005cf6b4..010417c3 100644 --- a/Source/Images/hd_cpm3.txt +++ b/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: diff --git a/Source/Images/hd_nzcom.txt b/Source/Images/hd_nzcom.txt index 53d826c4..cf97e497 100644 --- a/Source/Images/hd_nzcom.txt +++ b/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: diff --git a/Source/Images/hd_qpm.txt b/Source/Images/hd_qpm.txt index 436941b4..3aad64c4 100644 --- a/Source/Images/hd_qpm.txt +++ b/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: diff --git a/Source/Images/hd_z3plus.txt b/Source/Images/hd_z3plus.txt index 879219e2..1dd901ca 100644 --- a/Source/Images/hd_z3plus.txt +++ b/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: diff --git a/Source/Images/hd_zpm3.txt b/Source/Images/hd_zpm3.txt index 28009fd0..f6f8ab47 100644 --- a/Source/Images/hd_zpm3.txt +++ b/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: diff --git a/Source/Images/hd_zsdos.txt b/Source/Images/hd_zsdos.txt index d2c389ea..9babd296 100644 --- a/Source/Images/hd_zsdos.txt +++ b/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: diff --git a/Source/Makefile b/Source/Makefile index 012b6cf2..e741cc4c 100644 --- a/Source/Makefile +++ b/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)