From 7236aec3fe729630309102b951ffe4e34acca0ef Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Wed, 17 Mar 2021 17:59:29 -0700 Subject: [PATCH] ZZRCC Disk Image Enhancements Bill has provided an improved mechanism to allow ZZRCC to boot directly from CF Card. This work has been incorporated directly into the diskimage creation process for the ZZRCC disk image. --- Source/ZZR/Build.cmd | 6 ++++-- Source/ZZR/Makefile | 10 +++++++--- Source/ZZR/ZZR Disk Layout.txt | 2 ++ Source/ZZR/zzr_mon.bin | Bin 4096 -> 4096 bytes Source/ver.inc | 2 +- Source/ver.lib | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Source/ZZR/Build.cmd b/Source/ZZR/Build.cmd index 57aecb92..6b1fe5f6 100644 --- a/Source/ZZR/Build.cmd +++ b/Source/ZZR/Build.cmd @@ -3,8 +3,10 @@ setlocal if not exist ..\..\Binary\RCZ280_nat_zzr.rom goto :eof -..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Exclude 0x5000 0x7000 -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel +..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Exclude 0x5000 0x7000 zzr_romldr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel -copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat +..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr_ldr.rom -Binary + +copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr_ldr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat copy /b ..\..\Binary\hd1024_zzr_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zzr_combo.img \ No newline at end of file diff --git a/Source/ZZR/Makefile b/Source/ZZR/Makefile index 2980517a..7de1e4e0 100644 --- a/Source/ZZR/Makefile +++ b/Source/ZZR/Makefile @@ -1,6 +1,7 @@ HD1024ZZRPREFIX = hd1024_zzr_prefix.dat HD1024ZZZROMBOIMG = hd1024_zzr_combo.img ZZRROM = ../../Binary/RCZ280_nat_zzr.rom +ZZRLDRROM = RCZ280_nat_zzr_ldr.rom ZZRROMHEX = RCZ280_nat_zzr.hex HD1024IMGS = ../../Binary/hd1024_cpm22.img ../../Binary/hd1024_zsdos.img ../../Binary/hd1024_nzcom.img \ ../../Binary/hd1024_cpm3.img ../../Binary/hd1024_zpm3.img ../../Binary/hd1024_ws4.img @@ -10,7 +11,7 @@ OBJECTS := ifneq ($(wildcard $(ZZRROM)),) - OBJECTS += $(HD1024ZZRPREFIX) $(HD1024ZZZROMBOIMG) $(ZZRROMHEX) + OBJECTS += $(ZZRROMHEX) $(ZZRLDRROM) $(HD1024ZZRPREFIX) $(HD1024ZZZROMBOIMG) endif DEST=../../Binary @@ -22,10 +23,13 @@ include $(TOOLS)/Makefile.inc DIFFPATH = $(DIFFTO)/Binary $(HD1024ZZRPREFIX): - cat zzr_cfldr.bin zzr_ptbl.bin zzr_fill_1.bin zzr_mon.bin zzr_fill_2.bin $(ZZRROM) zzr_fill_3.bin >$@ + cat zzr_cfldr.bin zzr_ptbl.bin zzr_fill_1.bin zzr_mon.bin zzr_fill_2.bin $(ZZRLDRROM) zzr_fill_3.bin >$@ $(HD1024ZZZROMBOIMG): $(HD1024ZZRPREFIX) $(HD1024IMGS) cat $^ > $@ $(ZZRROMHEX): $(ZZRROM) - srec_cat $(ZZRROM) -Binary -Exclude 0x5000 0x7000 -Output $(ZZRROMHEX) -Intel \ No newline at end of file + srec_cat $(ZZRROM) -Binary -Exclude 0x5000 0x7000 zzr_romldr.hex -Intel -Output $(ZZRROMHEX) -Intel + +$(ZZRLDRROM): $(ZZRROMHEX) + srec_cat $(ZZRROMHEX) -Intel -Output $(ZZRLDRROM) -Binary diff --git a/Source/ZZR/ZZR Disk Layout.txt b/Source/ZZR/ZZR Disk Layout.txt index a584b166..edf6a1ae 100644 --- a/Source/ZZR/ZZR Disk Layout.txt +++ b/Source/ZZR/ZZR Disk Layout.txt @@ -9,6 +9,8 @@ Start Length Sector Count Description 0x64000 0x9C000 0x320 0x4E0 Filler 0x100000 0x800 Slices +Must insert zzr_romldr.bin at 0x5000-x5FFF of ROM image. This is also 0x29000-0x29FFF of CF image. + Notes ----- diff --git a/Source/ZZR/zzr_mon.bin b/Source/ZZR/zzr_mon.bin index 719029c168ee9dece9a0e585c901f792f20b9b5d..d9bbfcca498ca4b053a297af70b688249d225a74 100644 GIT binary patch delta 2700 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 diff --git a/Source/ver.inc b/Source/ver.inc index 7483a543..ea3f72f1 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.63" +#DEFINE BIOSVER "3.1.1-pre.64" diff --git a/Source/ver.lib b/Source/ver.lib index 280a27a8..da8ade19 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.63" + db "3.1.1-pre.64" endm