From 72fcee24f3f767a5057e8d67f89515eddd1ba8d8 Mon Sep 17 00:00:00 2001 From: Mark Pruden Date: Thu, 17 Oct 2024 15:42:41 +1100 Subject: [PATCH 1/4] Publish the CPM2.2 CPM.SYS Binary Files in a new Binary/CPM22 folder --- Binary/CPM22/Clean.cmd | 4 ++++ Binary/CPM22/Makefile | 7 +++++++ Binary/CPM22/ReadMe.txt | 23 +++++++++++++++++++++++ Binary/Clean.cmd | 1 + Binary/Makefile | 2 +- Binary/ReadMe.txt | 23 +++++++++++++++++++++++ Source/CPM22/Build.cmd | 4 ++++ Source/CPM22/Makefile | 12 +++++++++--- 8 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 Binary/CPM22/Clean.cmd create mode 100644 Binary/CPM22/Makefile create mode 100644 Binary/CPM22/ReadMe.txt diff --git a/Binary/CPM22/Clean.cmd b/Binary/CPM22/Clean.cmd new file mode 100644 index 00000000..1534a178 --- /dev/null +++ b/Binary/CPM22/Clean.cmd @@ -0,0 +1,4 @@ +@echo off +setlocal + +if exist *.sys del *.sys diff --git a/Binary/CPM22/Makefile b/Binary/CPM22/Makefile new file mode 100644 index 00000000..e7fda1a3 --- /dev/null +++ b/Binary/CPM22/Makefile @@ -0,0 +1,7 @@ +TOOLS = ../../Tools +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr) + +include $(TOOLS)/Makefile.inc + +clean:: + @rm -f *.sys diff --git a/Binary/CPM22/ReadMe.txt b/Binary/CPM22/ReadMe.txt new file mode 100644 index 00000000..1f0379b5 --- /dev/null +++ b/Binary/CPM22/ReadMe.txt @@ -0,0 +1,23 @@ +*********************************************************************** +*** *** +*** R o m W B W *** +*** *** +*** Z80/Z180 System Software *** +*** *** +*********************************************************************** + +This directory contains the CP/M 2.2 system files for the RomWBW CP/M 2.2 +adaptation. All of these files are already included on the CP/M +boot disk images. However if you are creating a CP/M boot disk +manually, you should copy all of these files to the boot disk. + +Note: Two file have been provided one for RomWBW HBIOS, and one for UNA +BIOS. One of these files must be installed on the system boot track. +This is usually achieved by the SYSCOPY utility e.g. + +SYSCOPY a:=cpm_wbw.sys + +These files should also be copied to any CP/M 2.2 boot disks on your +system when you upgrade your ROM firmware. Some of these files +*must* match the version of the RomWBW firmware you are using for +proper operation of your system. diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index c6ad4ab5..9201a750 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -12,6 +12,7 @@ if exist *.pdf del *.pdf if exist *.eeprom del *.eeprom pushd Apps && call Clean || exit /b 1 & popd +pushd CPM22 && call Clean || exit /b 1 & popd pushd CPM3 && call Clean || exit /b 1 & popd pushd ZPM3 && call Clean || exit /b 1 & popd pushd CPNET && call Clean || exit /b 1 & popd diff --git a/Binary/Makefile b/Binary/Makefile index 76f45163..21b3864d 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,6 +1,6 @@ TOOLS = ../Tools MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom) -SUBDIRS = Apps CPM3 ZPM3 CPNET +SUBDIRS = Apps CPM22 CPM3 ZPM3 CPNET include $(TOOLS)/Makefile.inc diff --git a/Binary/ReadMe.txt b/Binary/ReadMe.txt index be0294ce..46b318a7 100644 --- a/Binary/ReadMe.txt +++ b/Binary/ReadMe.txt @@ -163,9 +163,32 @@ indicates which file targets each of the Propeller board variants: Refer to the board documentation of the boards for more information on how to program the EEPROMs on these boards. +SUB DIRECTORIES +=============== + Apps Directory -------------- The Apps subdirectory contains the executable application files that are specific to RomWBW. The source for these applications is found in the Source\Apps directory of the distribution. + +CPNET Directory +--------------- + +This directory contains the CP/NET client packages. Please refer to +the RomWBW User Guide for instructions on installing these packages, +or see the Readme.txt file in this sub-directory + +CPM22 CPM3 ZPM3 Directories +--------------------------- + +These directories contains the system files for the RomWBW adaptations +for each operating system. All of these files are already included on +the boot disk images. However if you are creating a o/s boot disk +manually, you will need copy all of these files to the boot disk. + +These files should also be copied to any boot disks on your +system when you upgrade your ROM firmware. Some of these files +*must* match the version of the RomWBW firmware you are using for +proper operation of your system. diff --git a/Source/CPM22/Build.cmd b/Source/CPM22/Build.cmd index 7eabae15..2122554b 100644 --- a/Source/CPM22/Build.cmd +++ b/Source/CPM22/Build.cmd @@ -38,6 +38,10 @@ copy /b os2ccp.bin + os3bdos.bin + ..\cbios\cbios_una.bin cpm_una.bin || exit /b copy /b loader.bin + cpm_wbw.bin cpm_wbw.sys || exit /b copy /b loader.bin + cpm_una.bin cpm_una.sys || exit /b +rem Copy OS files to Binary directory +copy cpm_wbw.sys ..\..\Binary\CPM22 || exit /b +copy cpm_una.sys ..\..\Binary\CPM22 || exit /b + goto :eof :asm diff --git a/Source/CPM22/Makefile b/Source/CPM22/Makefile index b1f37b0d..fa7492df 100644 --- a/Source/CPM22/Makefile +++ b/Source/CPM22/Makefile @@ -3,14 +3,20 @@ BINFILES = cpm_wbw.bin cpm_una.bin OBJECTS = CCP.bin BDOS.bin CCP22.bin BDOS22.bin OS2CCP.bin OS3BDOS.bin \ ccpb03.bin bdosb01.bin loader.bin $(SYSFILES) $(BINFILES) OTHERS = *.hex +NOCOPY = cpm_wbw.bin cpm_una.bin \ + CCP.bin BDOS.bin CCP22.bin BDOS22.bin OS2CCP.bin OS3BDOS.bin \ + ccpb03.bin bdosb01.bin loader.bin + +DEST = ../../Binary/CPM22 TOOLS = ../../Tools + include $(TOOLS)/Makefile.inc -%.sys: %.bin loader.bin - cat loader.bin $*.bin > $@ +%.sys: %.bin loader.bin + cat loader.bin $*.bin > $@ cpm_una.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin > $@ - + cpm_wbw.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin > $@ From b3b4426a4669e7c59b19e505cf1964f0d6d1709d Mon Sep 17 00:00:00 2001 From: Mark Pruden Date: Fri, 18 Oct 2024 10:42:38 +1100 Subject: [PATCH 2/4] Publish the ZSDOS .SYS Binary Files in a new Binary/ZSDOS folder --- Binary/Clean.cmd | 1 + Binary/Makefile | 2 +- Binary/ZSDOS/Clean.cmd | 4 ++++ Binary/ZSDOS/Makefile | 7 +++++++ Binary/ZSDOS/ReadMe.txt | 23 +++++++++++++++++++++++ Source/ZSDOS/Build.cmd | 4 ++++ Source/ZSDOS/Makefile | 8 +++++--- 7 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Binary/ZSDOS/Clean.cmd create mode 100644 Binary/ZSDOS/Makefile create mode 100644 Binary/ZSDOS/ReadMe.txt diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index 9201a750..0effb36c 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -14,5 +14,6 @@ if exist *.eeprom del *.eeprom pushd Apps && call Clean || exit /b 1 & popd pushd CPM22 && call Clean || exit /b 1 & popd pushd CPM3 && call Clean || exit /b 1 & popd +pushd ZSDOS && call Clean || exit /b 1 & popd pushd ZPM3 && call Clean || exit /b 1 & popd pushd CPNET && call Clean || exit /b 1 & popd diff --git a/Binary/Makefile b/Binary/Makefile index 21b3864d..839e62dd 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,6 +1,6 @@ TOOLS = ../Tools MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom) -SUBDIRS = Apps CPM22 CPM3 ZPM3 CPNET +SUBDIRS = Apps CPM22 CPM3 ZSDOS ZPM3 CPNET include $(TOOLS)/Makefile.inc diff --git a/Binary/ZSDOS/Clean.cmd b/Binary/ZSDOS/Clean.cmd new file mode 100644 index 00000000..1534a178 --- /dev/null +++ b/Binary/ZSDOS/Clean.cmd @@ -0,0 +1,4 @@ +@echo off +setlocal + +if exist *.sys del *.sys diff --git a/Binary/ZSDOS/Makefile b/Binary/ZSDOS/Makefile new file mode 100644 index 00000000..e7fda1a3 --- /dev/null +++ b/Binary/ZSDOS/Makefile @@ -0,0 +1,7 @@ +TOOLS = ../../Tools +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr) + +include $(TOOLS)/Makefile.inc + +clean:: + @rm -f *.sys diff --git a/Binary/ZSDOS/ReadMe.txt b/Binary/ZSDOS/ReadMe.txt new file mode 100644 index 00000000..f43a12d4 --- /dev/null +++ b/Binary/ZSDOS/ReadMe.txt @@ -0,0 +1,23 @@ +*********************************************************************** +*** *** +*** R o m W B W *** +*** *** +*** Z80/Z180 System Software *** +*** *** +*********************************************************************** + +This directory contains the ZSDOS system files for the RomWBW ZSDOS +adaptation. All of these files are already included on the ZSDOS +boot disk images. However if you are creating a ZSDOS boot disk +manually, you should copy all of these files to the boot disk. + +Note: Two file have been provided one for RomWBW HBIOS, and one for UNA +BIOS. One of these files must be installed on the system boot track. +This is usually achieved by the SYSCOPY utility e.g. + +SYSCOPY a:=zsys_wbw.sys + +These files should also be copied to any ZSDOS boot disks on your +system when you upgrade your ROM firmware. Some of these files +*must* match the version of the RomWBW firmware you are using for +proper operation of your system. diff --git a/Source/ZSDOS/Build.cmd b/Source/ZSDOS/Build.cmd index 554a8dbb..def38fef 100644 --- a/Source/ZSDOS/Build.cmd +++ b/Source/ZSDOS/Build.cmd @@ -19,3 +19,7 @@ copy /b ..\zcpr-dj\zcpr.bin + zsdos.bin + ..\cbios\cbios_una.bin zsys_una.bin || copy /b loader.bin + zsys_wbw.bin zsys_wbw.sys || exit /b copy /b loader.bin + zsys_una.bin zsys_una.sys || exit /b + +rem Copy OS files to Binary directory +copy zsys_wbw.sys ..\..\Binary\ZSDOS || exit /b +copy zsys_una.sys ..\..\Binary\ZSDOS || exit /b diff --git a/Source/ZSDOS/Makefile b/Source/ZSDOS/Makefile index 55731ea4..a8c54f49 100644 --- a/Source/ZSDOS/Makefile +++ b/Source/ZSDOS/Makefile @@ -2,6 +2,8 @@ SYSFILES = zsys_wbw.sys zsys_una.sys BINFILES = zsys_wbw.bin zsys_una.bin OBJECTS = $(SYSFILES) $(BINFILES) OTHERS = zsdos.rel zsdos.err loader.bin zsdos.bin +NOCOPY = zsys_wbw.bin zsys_una.bin loader.* zsdos.* +DEST = ../../Binary/ZSDOS TOOLS = ../../Tools CCP = ../ZCPR-DJ/zcpr.bin @@ -13,9 +15,9 @@ zsdos.rel: zsdos.z80 zsdos.bin: zsdos.rel $(ZXCC) LINK -$@=$<[LD800] -%.sys: %.bin loader.bin - cat loader.bin $*.bin > $@ - +%.sys: %.bin loader.bin + cat loader.bin $*.bin > $@ + zsys_wbw.bin: $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin cat $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin > $@ From a2fcab404524a9f03dbdae033d00b5f56dd56bf1 Mon Sep 17 00:00:00 2001 From: Mark Pruden Date: Fri, 18 Oct 2024 10:49:37 +1100 Subject: [PATCH 3/4] Minor Documentation fix in Readme File --- Binary/ReadMe.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Binary/ReadMe.txt b/Binary/ReadMe.txt index 46b318a7..0858424f 100644 --- a/Binary/ReadMe.txt +++ b/Binary/ReadMe.txt @@ -180,8 +180,8 @@ This directory contains the CP/NET client packages. Please refer to the RomWBW User Guide for instructions on installing these packages, or see the Readme.txt file in this sub-directory -CPM22 CPM3 ZPM3 Directories ---------------------------- +CPM22 CPM3 ZSDOS ZPM3 Directories +--------------------------------- These directories contains the system files for the RomWBW adaptations for each operating system. All of these files are already included on From 99265f03d1bfddc9d681da8f444865d6d688620c Mon Sep 17 00:00:00 2001 From: Mark Pruden Date: Fri, 18 Oct 2024 11:45:39 +1100 Subject: [PATCH 4/4] QPM Copy SYS Files to the Binary Distribution Folder --- Binary/Clean.cmd | 1 + Binary/Makefile | 2 +- Binary/QPM/Clean.cmd | 4 ++++ Binary/QPM/Makefile | 7 +++++++ Binary/QPM/ReadMe.txt | 21 +++++++++++++++++++++ Binary/ReadMe.txt | 4 ++-- Source/QPM/Build.cmd | 4 ++++ Source/QPM/Makefile | 8 +++++--- 8 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 Binary/QPM/Clean.cmd create mode 100644 Binary/QPM/Makefile create mode 100644 Binary/QPM/ReadMe.txt diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index 0effb36c..110393d5 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -14,6 +14,7 @@ if exist *.eeprom del *.eeprom pushd Apps && call Clean || exit /b 1 & popd pushd CPM22 && call Clean || exit /b 1 & popd pushd CPM3 && call Clean || exit /b 1 & popd +pushd QPM && call Clean || exit /b 1 & popd pushd ZSDOS && call Clean || exit /b 1 & popd pushd ZPM3 && call Clean || exit /b 1 & popd pushd CPNET && call Clean || exit /b 1 & popd diff --git a/Binary/Makefile b/Binary/Makefile index 839e62dd..2d8595c3 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -1,6 +1,6 @@ TOOLS = ../Tools MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom) -SUBDIRS = Apps CPM22 CPM3 ZSDOS ZPM3 CPNET +SUBDIRS = Apps CPM22 CPM3 QPM ZSDOS ZPM3 CPNET include $(TOOLS)/Makefile.inc diff --git a/Binary/QPM/Clean.cmd b/Binary/QPM/Clean.cmd new file mode 100644 index 00000000..1534a178 --- /dev/null +++ b/Binary/QPM/Clean.cmd @@ -0,0 +1,4 @@ +@echo off +setlocal + +if exist *.sys del *.sys diff --git a/Binary/QPM/Makefile b/Binary/QPM/Makefile new file mode 100644 index 00000000..3f7ea93b --- /dev/null +++ b/Binary/QPM/Makefile @@ -0,0 +1,7 @@ +TOOLS = ../../Tools +MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr) + +include $(TOOLS)/Makefile.inc + +clean:: + @rm -f *.sys *.bin diff --git a/Binary/QPM/ReadMe.txt b/Binary/QPM/ReadMe.txt new file mode 100644 index 00000000..8386b13f --- /dev/null +++ b/Binary/QPM/ReadMe.txt @@ -0,0 +1,21 @@ +*********************************************************************** +*** *** +*** R o m W B W *** +*** *** +*** Z80/Z180 System Software *** +*** *** +*********************************************************************** + +This directory contains the QPM 2.7 system files for the RomWBW QPM 2.7 +adaptation. All of these files are already included on the QPM +boot disk images. However if you are creating a QPM boot disk +manually, you should copy all of these files to the boot disk. + +Note: Two file have been provided one for RomWBW HBIOS, and one for UNA +BIOS. One of these files must be installed on the system boot track. +Refer to the QPM Documentation for installing QPM + +These files should also be copied to any QPM boot disks on your +system when you upgrade your ROM firmware. Some of these files +*must* match the version of the RomWBW firmware you are using for +proper operation of your system. diff --git a/Binary/ReadMe.txt b/Binary/ReadMe.txt index 0858424f..bdd7f0cd 100644 --- a/Binary/ReadMe.txt +++ b/Binary/ReadMe.txt @@ -180,8 +180,8 @@ This directory contains the CP/NET client packages. Please refer to the RomWBW User Guide for instructions on installing these packages, or see the Readme.txt file in this sub-directory -CPM22 CPM3 ZSDOS ZPM3 Directories ---------------------------------- +CPM22 CPM3 ZSDOS ZPM3 QPM Directories +------------------------------------- These directories contains the system files for the RomWBW adaptations for each operating system. All of these files are already included on diff --git a/Source/QPM/Build.cmd b/Source/QPM/Build.cmd index c8a3955c..06fbe9d9 100644 --- a/Source/QPM/Build.cmd +++ b/Source/QPM/Build.cmd @@ -17,4 +17,8 @@ copy /b qcp27.dat + qdos27.dat + ..\cbios\cbios_una.bin qpm_una.bin || exit /b copy /b loader.bin + qpm_wbw.bin qpm_wbw.sys || exit /b copy /b loader.bin + qpm_una.bin qpm_una.sys || exit /b +rem Copy OS files to Binary directory +copy qpm_wbw.sys ..\..\Binary\QPM || exit /b +copy qpm_una.sys ..\..\Binary\QPM || exit /b + goto :eof diff --git a/Source/QPM/Makefile b/Source/QPM/Makefile index 30c414eb..d951500e 100644 --- a/Source/QPM/Makefile +++ b/Source/QPM/Makefile @@ -2,14 +2,16 @@ SYSFILES = qpm_wbw.sys qpm_una.sys BINFILES = qpm_wbw.bin qpm_una.bin OBJECTS = loader.bin $(SYSFILES) $(BINFILES) OTHERS = *.hex +NOCOPY = qpm_wbw.bin qpm_una.bin loader.bin loader.lst +DEST = ../../Binary/QPM TOOLS = ../../Tools include $(TOOLS)/Makefile.inc -%.sys: %.bin loader.bin - cat loader.bin $*.bin > $@ +%.sys: %.bin loader.bin + cat loader.bin $*.bin > $@ qpm_una.bin: qcp27.dat qdos27.dat ../CBIOS/cbios_una.bin cat qcp27.dat qdos27.dat ../CBIOS/cbios_una.bin > $@ - + qpm_wbw.bin: qcp27.dat qdos27.dat ../CBIOS/cbios_wbw.bin cat qcp27.dat qdos27.dat ../CBIOS/cbios_wbw.bin > $@