Improve DEFSERCFG Config

- Move DEFSERCFG from an equate to a #DEFINE which allows properly overriding it globally.

.github/workflows/release.yml

@@ -31,6 +31,8 @@ jobs:
           echo "Tag: ${{github.ref_name}}"
           if grep -q "dev" <<< "${{github.ref_name}}"; then
             TITLE="RomWBW Development Snapshot"
+          elif grep -q "beta" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Beta Release"
           elif grep -q "pre" <<< "${{github.ref_name}}"; then
             TITLE="RomWBW Prerelease"
           elif grep -q "rc" <<< "${{github.ref_name}}"; then

.gitignore

@@ -20,7 +20,7 @@
 
 Binary/**/*.mym
 Binary/**/*.pt3
-!Binary/CPNET/NetBoot/cpnos-wbw.sys
+!Binary/CPNET/NetBoot/*/cpnos.sys
 
 Source/**/eeprom
 Source/Apps/Assign.com
@@ -77,6 +77,7 @@ Tools/unix/zx/zx
 
 !Source/ver.lib
 !Source/Apps/FAT/FAT.COM
+!Source/Apps/copysl/copysl.com
 !Source/Apps/ZMP/zmpx.com
 !Source/Apps/ZMD/zmdsubs.rel
 !Source/Apps/Test/vdctest/font.asm
@@ -97,6 +98,7 @@ Tools/unix/zx/zx
 !Source/ZSDOS/*.[Cc][Oo][Mm]
 !Source/ZRC/*.bin
 !Source/ZRC512/*.bin
+!Source/EZ512/*.bin
 !Source/Z1RCC/*.bin
 !Source/ZZRCC/*.bin
 !Source/FZ80/*.bin
@@ -110,4 +112,142 @@ Source/ZPM3/zccp.com
 Source/ZPM3/zpmldr.com
 Source/ZPM3/genbnk.dat
 
-Source/ZSDOS/zsdos.err
+Source/ZSDOS/zsdos.err
+
+# Lets explicit list all generate untracked binary files
+Binary/Apps/Tunes/bgm.vgm
+Binary/Apps/Tunes/ending.vgm
+Binary/Apps/Tunes/inchina.vgm
+Binary/Apps/Tunes/shirakaw.vgm
+Binary/Apps/Tunes/startdem.vgm
+Binary/Apps/Tunes/wonder01.vgm
+Binary/Apps/fdu.doc
+Binary/Apps/zmconfig.ovr
+Binary/Apps/zminit.ovr
+Binary/Apps/zmp.doc
+Binary/Apps/zmp.hlp
+Binary/Apps/zmterm.ovr
+Binary/Apps/zmxfer.ovr
+Binary/CPM3/bdos3.spr
+Binary/CPM3/bios3.spr
+Binary/CPM3/bnkbdos3.spr
+Binary/CPM3/bnkbios3.spr
+Binary/CPM3/cpm3fix.pat
+Binary/CPM3/genbnk.dat
+Binary/CPM3/gencpm.dat
+Binary/CPM3/genres.dat
+Binary/CPM3/readme.1st
+Binary/CPM3/resbdos3.spr
+Binary/CPNET/cpn12duo.lbr
+Binary/CPNET/cpn12mt.lbr
+Binary/CPNET/cpn12ser.lbr
+Binary/CPNET/cpn3duo.lbr
+Binary/CPNET/cpn3mt.lbr
+Binary/CPNET/cpn3ser.lbr
+Binary/RCEZ80_std.upd
+Binary/RCZ80_std.upd
+Binary/ZPM3/bnkbdos3.spr
+Binary/ZPM3/bnkbios3.spr
+Binary/ZPM3/gencpm.dat
+Binary/ZPM3/resbdos3.spr
+Binary/ZPM3/zinstal.zpm
+Binary/hd1k_prefix.dat
+Source/BPBIOS/def-ww.lib
+Source/CPNET/cpn12duo.lbr
+Source/CPNET/cpn12mt.lbr
+Source/CPNET/cpn12ser.lbr
+Source/CPNET/cpn3duo.lbr
+Source/CPNET/cpn3mt.lbr
+Source/CPNET/cpn3ser.lbr
+Source/Fonts/font8x11c.asm
+Source/Fonts/font8x11c.bin
+Source/Fonts/font8x11u.asm
+Source/Fonts/font8x16c.asm
+Source/Fonts/font8x16c.bin
+Source/Fonts/font8x16u.asm
+Source/Fonts/font8x8c.asm
+Source/Fonts/font8x8c.bin
+Source/Fonts/font8x8u.asm
+Source/Fonts/fontcgac.asm
+Source/Fonts/fontcgac.bin
+Source/Fonts/fontcgau.asm
+Source/Fonts/fontvgarcc.asm
+Source/Fonts/fontvgarcc.bin
+Source/Fonts/fontvgarcu.asm
+Source/HBIOS/RCEZ80_std.upd
+Source/HBIOS/RCZ80_std.upd
+Source/HBIOS/build_env.cmd
+Source/HBIOS/hbios_env.sh
+Source/Images/blank144
+Source/Images/blankhd1k
+Source/Images/blankhd512
+Source/Images/fd144_aztecc.img
+Source/Images/fd144_bascomp.img
+Source/Images/fd144_cowgol.img
+Source/Images/fd144_cpm22.img
+Source/Images/fd144_cpm3.img
+Source/Images/fd144_fortran.img
+Source/Images/fd144_games.img
+Source/Images/fd144_hitechc.img
+Source/Images/fd144_nzcom.img
+Source/Images/fd144_qpm.img
+Source/Images/fd144_tpascal.img
+Source/Images/fd144_ws4.img
+Source/Images/fd144_z80asm.img
+Source/Images/fd144_zpm3.img
+Source/Images/fd144_zsdos.img
+Source/Images/hd1k_aztecc.img
+Source/Images/hd1k_bascomp.img
+Source/Images/hd1k_blank.img
+Source/Images/hd1k_bp.img
+Source/Images/hd1k_combo.img
+Source/Images/hd1k_cowgol.img
+Source/Images/hd1k_cpm22.img
+Source/Images/hd1k_cpm3.img
+Source/Images/hd1k_fortran.img
+Source/Images/hd1k_games.img
+Source/Images/hd1k_hitechc.img
+Source/Images/hd1k_nzcom.img
+Source/Images/hd1k_qpm.img
+Source/Images/hd1k_tpascal.img
+Source/Images/hd1k_ws4.img
+Source/Images/hd1k_z80asm.img
+Source/Images/hd1k_zpm3.img
+Source/Images/hd1k_zsdos.img
+Source/Images/hd512_aztecc.img
+Source/Images/hd512_bascomp.img
+Source/Images/hd512_blank.img
+Source/Images/hd512_combo.img
+Source/Images/hd512_cowgol.img
+Source/Images/hd512_cpm22.img
+Source/Images/hd512_cpm3.img
+Source/Images/hd512_dos65.img
+Source/Images/hd512_fortran.img
+Source/Images/hd512_games.img
+Source/Images/hd512_hitechc.img
+Source/Images/hd512_nzcom.img
+Source/Images/hd512_qpm.img
+Source/Images/hd512_tpascal.img
+Source/Images/hd512_ws4.img
+Source/Images/hd512_z80asm.img
+Source/Images/hd512_zpm3.img
+Source/Images/hd512_zsdos.img
+Source/RomDsk/rom0_una.dat
+Source/RomDsk/rom0_wbw.dat
+Source/RomDsk/rom128_una.dat
+Source/RomDsk/rom128_wbw.dat
+Source/RomDsk/rom256_una.dat
+Source/RomDsk/rom256_wbw.dat
+Source/RomDsk/rom384_una.dat
+Source/RomDsk/rom384_wbw.dat
+Source/RomDsk/rom896_una.dat
+Source/RomDsk/rom896_wbw.dat
+Source/ZCPR-DJ/zcprdemo.com
+Source/ZPM3/autotog.com
+Source/ZPM3/clrhist.com
+Source/ZPM3/cpmldr.com
+Source/ZPM3/setz3.com
+Tools/unix/OpenSpin/build/
+Tools/unix/zxcc/config.h
+Tools/unix/zxcc/zxcc
+Binary/Apps/bbcbasic.txt

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "files.trimTrailingWhitespace": false,
+  "files.eol": "\r\n"
+}

Binary/Apps/Test/inttest.doc

@@ -0,0 +1,44 @@
+INTTEST
+=======
+
+RomWBW includes an API allowing applications to "hook" interrupts.
+The `INTTEST` utility allows you to test this functionality.
+
+
+** Syntax **
+
+`INTTEST`
+
+
+** Usage **
+
+`INTTEST` is an interactive application.  At startup, it will display
+a list of the interrupt vector slots in your system along with the
+current vector address for each of them.
+
+It then prompts you to enter the slot number (in hex) of a vector to
+hook.  After entering this, the application will watch the hooked
+vector and countdown from 0xFF to 0x00 as interrupts are noted.
+
+When the counter reaches 0x00, the interrupt is unhooked and the
+application terminates.  The application can also be terminated by
+pressing <esc>.
+
+
+** Notes **
+
+If your system is running without interrupts active, the application
+will terminate immediately.
+
+All slots have vectors even if the corresponding interrupt is not
+doing anything.  In this case, the vector is pointing to the "bad
+interrupt" handler.
+
+If you hook a vector that is not receiving any interrupts, the
+down-counter will not do anything.
+
+
+** Etymology* *
+
+The `INTTEST` command is an original product and the source code is
+provided in the RomWBW distribution.

Binary/CPM22/Clean.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+if exist *.sys del *.sys

Binary/CPM22/Makefile

@@ -0,0 +1,7 @@
+TOOLS = ../../Tools
+MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr)
+
+include $(TOOLS)/Makefile.inc
+
+clean::
+	@rm -f *.sys

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.

Binary/Clean.cmd

@@ -12,6 +12,9 @@ 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 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

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 QPM ZSDOS ZPM3 CPNET
 
 include $(TOOLS)/Makefile.inc
 

Binary/QPM/Clean.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+if exist *.sys del *.sys

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

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.

Binary/ReadMe.txt

@@ -6,37 +6,37 @@
 ***                                                                 ***
 ***********************************************************************
 
-This directory ("Binary") is part of the RomWBW System Software 
-distribution archive.  It contains the completed binary outputs of 
-the build process.  As described below, these files are used to 
+This directory ("Binary") is part of the RomWBW System Software
+distribution archive.  It contains the completed binary outputs of
+the build process.  As described below, these files are used to
 assemble a working RetroBrew Computers system.
 
-The files in this directory are created by the build process that is 
-documented in the ReadMe.txt file in the Source directory.  When 
-released the directory is populated with the default output files.  
-However, the output of custom builds will be placed in this directory 
+The files in this directory are created by the build process that is
+documented in the ReadMe.txt file in the Source directory.  When
+released the directory is populated with the default output files.
+However, the output of custom builds will be placed in this directory
 as well.
 
-If you only see a few files in this directory, then you downloaded 
-just the source from GitHub.  To retrieve the full release download 
-package, go to https://github.com/wwarthen/RomWBW.  On this page, 
-look for the text "XX releases" where XX is a number. Click on this 
-text to go to the releases page.  On this page, you will see the 
-latest releases listed.  For each release, you will see a package 
-file called something like "RomWBW-2.9.0-Package.zip".  Click on the 
+If you only see a few files in this directory, then you downloaded
+just the source from GitHub.  To retrieve the full release download
+package, go to https://github.com/wwarthen/RomWBW.  On this page,
+look for the text "XX releases" where XX is a number. Click on this
+text to go to the releases page.  On this page, you will see the
+latest releases listed.  For each release, you will see a package
+file called something like "RomWBW-2.9.0-Package.zip".  Click on the
 package file for the release you want to download.
 
 ROM Firmware Images (<plt>_<cfg>.rom)
 -------------------------------------
 
-The files with a ".rom" extension are binary images ready to program 
-into an appropriate PROM.  These files are named with the format 
-<plt>_<cfg>.rom. <plt> refers to the primary platform such as Zeta, 
-N8, Mark IV, etc.  <cfg> refers to the specific configuration.  In 
-general, there will be a standard configuration ("std") for each 
-platform.  So, for example, the file called MK4_std.rom is a ROM 
-image for the Mark IV with the standard configuration. If a custom 
-configuration called "custom" is created and built, a new file called 
+The files with a ".rom" extension are binary images ready to program
+into an appropriate PROM.  These files are named with the format
+<plt>_<cfg>.rom. <plt> refers to the primary platform such as Zeta,
+N8, Mark IV, etc.  <cfg> refers to the specific configuration.  In
+general, there will be a standard configuration ("std") for each
+platform.  So, for example, the file called MK4_std.rom is a ROM
+image for the Mark IV with the standard configuration. If a custom
+configuration called "custom" is created and built, a new file called
 MK4_custom.rom will be added to this directory.
 
 Documentation of the pre-built ROM Images is contained in
@@ -54,52 +54,52 @@ contents.  Refer to the RomWBW User Guide for more information.
 ROM Executable Images (<plt>_<cfg>.com)
 ---------------------------------------
 
-When a ROM image (".rom") is created, an executable version of the 
-ROM is also created.  These files have the same naming convention as 
-the ROM Image files, but have the extension ".com".  These files can 
+When a ROM image (".rom") is created, an executable version of the
+ROM is also created.  These files have the same naming convention as
+the ROM Image files, but have the extension ".com".  These files can
 be copied to a working system and run like a normal CP/M application.
 
-When run on the target system, they install in RAM just like they had 
+When run on the target system, they install in RAM just like they had
 been loaded from  ROM.  This allows a new ROM build to be tested
 without reprogramming the actual ROM.
 
-WARNING: In a few cases the .com file is too big to load.  If you get 
-a message like "Full" or "BAD LOAD" when trying to load one of the 
-.com files, it is too big.  In these cases, you will not be able to 
+WARNING: In a few cases the .com file is too big to load.  If you get
+a message like "Full" or "BAD LOAD" when trying to load one of the
+.com files, it is too big.  In these cases, you will not be able to
 test the ROM prior to programming it.
 
 VDU ROM Image (vdu.rom)
 -----------------------
 
-The VDU video board requires a dedicated onboard ROM containing the 
-font data.  The "vdu.rom" file contains the binary data to program 
+The VDU video board requires a dedicated onboard ROM containing the
+font data.  The "vdu.rom" file contains the binary data to program
 onto that chip.
 
-Disk Images (fd_*.img, hd_*.img, psys.img)
-------------------------------------------
+Disk Images (fd_*.img, hd_*.img)
+--------------------------------
 
-RomWBW includes a mechanism for generating floppy disk and hard disk 
-binary images that are ready to copy directly to a floppy, hard disk, 
-CF Card, or SD Card which will then be ready for use in any 
+RomWBW includes a mechanism for generating floppy disk and hard disk
+binary images that are ready to copy directly to a floppy, hard disk,
+CF Card, or SD Card which will then be ready for use in any
 RomWBW-based system.
 
-Essentially, these files contain prepared floppy and hard disk images 
-with a large set of programs and related files.  By copying the 
-contents of these files to appropriate media as described below, you 
+Essentially, these files contain prepared floppy and hard disk images
+with a large set of programs and related files.  By copying the
+contents of these files to appropriate media as described below, you
 can quickly create ready-to-use media.  Win32DiskImager or
 RawWriteWin can be used to copy images directly to media.  These
 programs are included in the RomWBW Tools directory.
 
-The fd_*.img files are floppy disk images.  They are sized for 1.44MB 
-floppy media and can be copied to actual floppy disks using 
-RawWriteWin (as long as you have access to a floppy drive on your 
-Windows computer).  The resulting floppy disks will be usable on any 
+The fd_*.img files are floppy disk images.  They are sized for 1.44MB
+floppy media and can be copied to actual floppy disks using
+RawWriteWin (as long as you have access to a floppy drive on your
+Windows computer).  The resulting floppy disks will be usable on any
 RomWBW-based system with floppy drive(s).
 
-Likewise, the hd512_*.img and hd1k_*.img files are hard disk images.  
-Each file is intended to be copied to the start of any type of hard 
-disk media (typically a CF Card or SD Card). The resulting media will 
-be usable on any RomWBW-based system that accepts the corresponding 
+Likewise, the hd512_*.img and hd1k_*.img files are hard disk images.
+Each file is intended to be copied to the start of any type of hard
+disk media (typically a CF Card or SD Card). The resulting media will
+be usable on any RomWBW-based system that accepts the corresponding
 media type.
 
 NOTE: The hd512_*.img files are equivalent to the hd_*.img
@@ -109,39 +109,86 @@ maximum number of CP/M directory entries from 512 to 1024.
 Refer to the ReadMe.txt in the Source/Images directory
 for details.
 
-Documentation of the pre-built disk images is contained in the 
+Documentation of the pre-built disk images is contained in the
 "RomWBW User Guide" found in the Doc directory.  The contents of
 the disk images is contained in the "RomWBW Disk Catalog", but it
 is significantly out-of-date.
 
-The contents of the floppy/hard disk images are created by 
-the BuildImages.cmd script in the Source directory.  Additional 
-information on how to generate custom disk images is found in the 
+The contents of the floppy/hard disk images are created by
+the BuildImages.cmd script in the Source directory.  Additional
+information on how to generate custom disk images is found in the
 Source\Images ReadMe.txt file.
 
-The psys.img file contains a full implementation of the UCSD p-System 
-for the Z80 running under RomWBW.  This image file must be placed on 
-disk media by itself (not appended or concatenated with hd*.img files.  
-Refer to the Source/pSys/ReadMe.txt file for more information on the 
+Disk Images (hd512_combo.img, hd1k_combo.img, *_std_hd1k_combo.img)
+-------------------------------------------------------------------
+
+The hd512_combo.img and hd1k_combo.img file are the primary combo
+disk image files suitable for most platforms.
+
+The *_std_hd1k_combo.img files are platform specific combo files
+typically used in romless platforms, they also contain RomWBW binary code
+that is loaded at boot time into RAM
+
+Disk Images (hd1k_prefix.dat, *_std_hd1k_prefix.dat)
+----------------------------------------------------
+
+The hd1k_prefix.dat file is part of the combo disk images and is
+applied to hd1k image files as a prefix, it contains the standard
+partion table.
+
+The *_std_hd1k_prefix.dat files are platform specific prefixes
+typically used in romless platforms, they also contain RomWBW binary code
+that is loaded at boot time into RAM
+
+Disk Images (psys.img)
+----------------------
+
+The psys.img file contains a full implementation of the UCSD p-System
+for the Z80 running under RomWBW.  This image file must be placed on
+disk media by itself (not appended or concatenated with hd*.img files.
+Refer to the Source/pSys/ReadMe.txt file for more information on the
 p-System implementation.
 
 Propeller ROM Images (*.eeprom)
 -------------------------------
 
-The files with and extension of ".eeprom" contain the binary images 
-to be programmed into the Propeller-based boards.  The list below 
+The files with and extension of ".eeprom" contain the binary images
+to be programmed into the Propeller-based boards.  The list below
 indicates which file targets each of the Propeller board variants:
 
 	ParPortProp	ParPortProp.eeprom
 	PropIO V1	PropIO.eeprom
 	PropIO V2	PropIO2.eeprom
 
-Refer to the board documentation of the boards for more information 
+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.
+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 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
+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.

Binary/ZSDOS/Clean.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+if exist *.sys del *.sys

Binary/ZSDOS/Makefile

@@ -0,0 +1,7 @@
+TOOLS = ../../Tools
+MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr)
+
+include $(TOOLS)/Makefile.inc
+
+clean::
+	@rm -f *.sys

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.

Doc/CPM/ReadMe.txt

@@ -30,10 +30,13 @@ The original DRI CP/M 3.0 Operating System Documentation Set.  This
 should be considered the primary reference for CP/M 3 system operation.
 
 
-NZCOM User's Manual ("NZCOM Users Manual.pdf")
-----------------------------------------------
+NZCOM, Z3PLUS, and replace ZCPR3.3 Documentation
+------------------------------------------------
 
-NZCOM operating system operation manual.
+NZCOM operating system operation manual. ("NZCOM Users Manual.pdf")
+Z3PLUS operating system operation manual.  ("Z3PLUS Users Manual.pdf")
+Z-System User Guide ("Z-System User Guide.pdf")
+ZCPR3.3 Users Guide ("ZCPR3.3 Users Guide.pdf")
 
 
 QP/M 2.7 Installation Guide and Supplements ("qpm27.pdf")

Doc/ChangeLog.txt

@@ -14,13 +14,45 @@ Version 3.5
 - DDW: Added support for Duodyne Media board
 - WBW: Auto restore TMS video on user reset (CP/M warm boot)
 - L?B: Added support for NABU w/ RomWBW Option Board
-- M?P: Reorganization of Doc directory introducing subfolders
+- MAP: Reorganization of Doc directory introducing subfolders
 - WBW: Upgraded BBCBASIC to v5.00
 - W?S: Updated FLASH utility to v1.3.9
 - WBW: Support RCBus PS/2 Keyboard (EP/Sally)
 - M?R: Update Timer app to display output in decimal
 - WBW: Preliminary support for S100 FPGA Z80 platform
 - WBW: Added simple serial (SSER) driver
+- WBW: Added preliminary support for S100 FPGA Z80 SD Cards
+- M?R: Consolidated ROM Applications document into the Applications document
+- M?R: Reviewed and substantially improved the Applications document
+- WBW: Added support for DS1305 RTC on S100 FPGA Z80
+- WBW: Added support for Les Bird's RCBus Graphics/Sound/Joystick module
+- WBW: Added support for Les Bird's Dual 16C550 UART module
+- WBW: Refactor UART driver for more flexible configuration
+- M?R: Added hour/minute/second display to timer app
+- WBW: Substantial customization of NZ-COM disk image
+- WBW: Refactor build post-processing (ZRC, ZZRCC, etc.)
+- MAP: Improved section Real Time Clock in User Guide document
+- WBW: Support for Hitachi HD44780-based LCD display
+- DRJ: Added support for Genesis STD Bus Z180 platform
+- MAP: Improved section Disk Management in User Guide document
+- WBW: Add CPU speed selection for HEATH platform to HBIOS
+- WBW: Add Warm/Cold reboot options to CPUSPD utility
+- D?N: Added support for eZ80 CPU
+- MAP: Contributed COPYSL utility
+- MAP: Added new HBIOS function EXT_SLICE (orginally SYSGET_DIOMED)
+- MAP: ROMLDR now uses EXT_SLICE to get Slice Sector for boot
+- MAP: CBIOS now uses EXT_SLICE during drive selection
+- MAP: CPM3 Boot Loader, and BIOS (drive select) now use EXT_SLICE
+- M?R: Added REBOOT application
+- 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, and boot device selection.
+- MAP: Added additional tools (Linker/Disasembler) to the Z80ASM Disk Image
+- PMS: Support interrupt-driven PS2 Keyboard Interface
+- D?M: Added NetBoot support for Duodyne
+- WBW: Add options to TUNE/HBIOS to force detection of MSX and RC AY/YM standard PSG ports
+- MAP: Added /B=OPTIONS for automated drive assignment to ASSIGN.COM
 
 Version 3.4
 -----------
@@ -689,4 +721,4 @@ interrupts disabled the BIOS will now start OK even if some vagrant
 hardware is asserting an interrupt (DISKIO).  Seems like this is better
 anyway -- general idea is that we only enable interupts precisely
 when desired for very specific controled purposes since there is no
-concept of interrupt dispatching available.
+concept of interrupt dispatching available.

Doc/Contrib/ZSystem.txt

@@ -20,7 +20,7 @@ Beyond the construction and integration of the actual DOS itself, the majority o
 
 The remainder of this document details the changes I made as I went along.  In all cases, my goal was to keep the result as close to the original distribution as possible.  I started by copying all of the files from the distribution (contained in zsdos2.zip) into Support\ZSDOS.  From there I tested, modified, updated, and customized as documented below.  Finally, I cherry picked files that made sense to include on the ZSystem ROM disks.
 
-1. CLOCKS.DAT has been updated to include the RomWBW clock driver, HBCLK.  I have also added the SIMHCLOK clock driver.
+1. CLOCKS.DAT has been updated to include the RomWBW clock driver, WBWCLK.  I have also added the SIMHCLOK clock driver.
 
 2. STAMPS.DAT has been replaced with an updated version.  The update was called STAMPS11.DAT and was found on the Walnut Creek CP/M CDROM.  The original version has a bug that prevents RSX (resident system extension) mode to load properly.
 

Doc/Testing Notes.txt

@@ -1,144 +0,0 @@
-SIMH (X)
-----
-- Test UART driver
-- Test HDSK driver
-
-Zeta 1 (X)
-------
-- Test UART driver
-- Test PPP detection (startup w/ and w/o PPP)
-- Test boot to CRT
-- Test PPPSD driver
-- Test PPPCON driver (video & kbd)
-- Test FD driver
-- Test FDU app
-
-Zeta 2 (X)
-------
-- Test UART driver
-- Test PPP detection (startup w/ and w/o PPP)
-- Test boot to CRT
-- Test PPPSD driver
-- Test PPPCON driver (video & kbd)
-- Test FD driver
-- Test FDU app
-
-RCBus (X)
-------
-- Test SIO driver (Serial Module)
-- Test ACIA driver (Dual Serial Module)
-- Test IDE driver (Compact Flash Module)
-- Test PPIDE driver (IDE Module)
-- Test FD driver (SMC and WDC)
-- Test FDU app (SMC and WDC)
-
-N8-2312 (X)
--------
-- Test ASCI driver
-- Test SD driver (CSIO mode)
-- Test FD driver
-- Test FDU app
-- Test TMS driver (video & kbd)
-
-N8-2511 (X)
--------
-- Test ASCI driver
-- Test SD driver (Juha mode)
-- Test FD driver
-- Test FDU app
-- Test TMS driver (video & kbd)
-
-SBC (X)
----
-- Test UART driver
-- Test PPIDE driver
-- Test PPISD driver
-- Test PRP detection
-- Test boot to CRT console
-
-MK4 (X)
----
-- Test ASCI driver
-- Test IDE driver
-- Test SD driver
-- Test PRP detection
-
-RAMF (X)
-----
-- Test RAMF driver
-
-PRP (X)
----
-- Test PRPSD driver
-- Test PRPCON driver (video & kbd)
-
-SCG (X)
----
-- Test TMS driver (video)
-
-VDU (X)
----
-- Test CVDU driver (video & kbd)
-
-CVDU (X)
-----
-- Test CVDU driver (video & kbd)
-
-VGA (X)
----
-- Test VGA driver (video & kbd)
-
-DIO (X)
----
-- Test FD driver
-- Test FDU app
-- Test IDE driver
-
-DIO3 (X)
-----
-- Test FD driver
-- Test FDU app
-- Test PPIDE driver
-
-DIDE (X)
-----
-- Test FD driver
-- Test FDU app
-- Test IDE driver
-
-DSD (X)
----
-- Test SD driver
-
-4UART (X)
------
-- Test UART driver
-
-
-UNA (X)
----
-- General Startup
-- Boot from disk functionality
-- Image loading
-- Monitor
-- XM app
-- ASSIGN app
-- MODE app
-- SYSCOPY app
-- OSLDR app
-- FDU app
-- FDISK80 app
-
-GENERAL (X)
--------
-- Boot to ROM
-- Boot to Disk
-- Boot to Monitor
-- XM app
-- XM port auto-detect
-- ASSIGN app
-- MODE app
-- SYSCOPY app
-- FDU app
-- FDISK80 app
-- TUNE app

Dockerfile

@@ -0,0 +1,48 @@
+FROM ubuntu:jammy-20240111 as basebuilder
+
+# This docker file can be used to build a tool chain docker image for building RomWBW images.
+
+# Tested on a ubuntu host and on Windows un WSL (with docker desktop)
+
+# First build the docker image (will b)
+# docker build --progress plain -t romwbw-chain .
+
+# After you have built the above image (called romwbw-chain), you can use it to compile and build the RomWBW images
+# as per the standard make scripts within RomWBW.
+# Start a new terminal, cd to where you have clone RomWBW, and then run this command: 
+# docker run -v ${PWD}:/src/ --privileged=true -u $(id -u ${USER}):$(id -g ${USER}) -it romwbw-chain:latest
+
+# you can now compile and build the required images:
+
+# cd Tools && make
+# cd Source && make # at least once to build many common units
+# cd Source && make rom ROM_PLATFORM=RCEZ80 ROM_CONFIG=std
+
+# when finish, type 'exit' to return to back to your standard terminal session
+
+LABEL Maintainer="Dean Netherton" \
+      Description="spike to use clang for ez80 target"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+
+RUN dpkg --add-architecture i386
+RUN sed -i 's/http:\/\/archive\.ubuntu\.com\/ubuntu/http:\/\/au.archive.ubuntu.com\/ubuntu/g' /etc/apt/sources.list
+RUN apt update -y
+RUN apt dist-upgrade -y
+RUN apt install -y --no-install-recommends cmake lzip ca-certificates mtools build-essential dos2unix libboost-all-dev texinfo texi2html libxml2-dev subversion bison flex zlib1g-dev m4 git wget dosfstools curl
+
+RUN mkdir work
+WORKDIR /work
+
+FROM basebuilder as main
+
+LABEL Maintainer="Dean Netherton" \
+      Description="spike to build RomWBW"
+
+RUN mkdir /src
+WORKDIR /src/
+
+RUN apt install -y --no-install-recommends build-essential libncurses-dev srecord bsdmainutils
+
+RUN adduser --disabled-password --gecos "" builder

Makefile

@@ -28,4 +28,4 @@ dist:
 	$(MAKE) --directory Source clean
 
 distlog:
-	$(MAKE) dist 2>&1 | tee make.log
+	time -p $(MAKE) dist 2>&1 | tee make.log

RELEASE_NOTES.md

@@ -0,0 +1,29 @@
+This file contains information useful to those upgrading to a new
+release of RomWBW.
+
+All Versions
+============
+
+- Please review Section "15 Upgrading" of the RomWBW User Guide.
+
+- Many RomWBW-specific applications are locked to the ROM version
+  being used.  After upgrading your ROM, you will need to upgrade
+  your disk-based RomWBW applications and OS boot files.
+
+Version 3.5
+===========
+
+- RomWBW is now more strict with respect to hard disk partition
+  tables.  If your hard disk media was created using any of the
+  pre-built disk image files, this will **not** affect you.  If not,
+  you may find you are unable to access slices beyond the first
+  slice.  If so, use FDISK80 to reset the partition table on the
+  disk.  This will restore normal access to all slices.  **Only** do
+  this if you are having an issue.
+
+- For those building custom ROMs, if you overriding
+  DEFSERCFG, note that this setting has been moved to a #DEFINE
+  instead of an equate (.SET or .EQU).  See cfg_MASTER.asm for
+  an example.  You will need to change your setting to a #DEFINE
+  at the top of your config file and remove any .SET or .EQU
+  lines for DEFSERCFG.

ReadMe.md

@@ -3,7 +3,7 @@
 **RomWBW ReadMe** \
 Version 3.5 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-30 Jun 2024
+18 Jan 2025
 
 # Overview
 
@@ -113,6 +113,9 @@ functionality.
 Complete instructions for installation and operation of RomWBW are found
 in the [RomWBW User
 Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20User%20Guide.pdf).
+It is also a good idea to review the [Release
+Notes](https://github.com/wwarthen/RomWBW/blob/master/RELEASE_NOTES.md)
+for helpful release-specific information.
 
 ## Documentation
 
@@ -124,8 +127,6 @@ Documentation for RomWBW includes:
   Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20System%20Guide.pdf)
 - [RomWBW
   Applications](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Applications.pdf)
-- [RomWBW ROM
-  Applications](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20ROM%20Applications.pdf)
 - [RomWBW
   Errata](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Errata.pdf)
 
@@ -188,8 +189,8 @@ let me know if I missed you!
 
 - Tasty Basic is a product of Dimitri Theulings.
 
-- Dean Netherton contributed the sound driver interface and the SN76489
-  sound driver.
+- Dean Netherton contributed eZ80 CPU support, the sound driver
+  interface, and the SN76489 sound driver.
 
 - The RomWBW Disk Catalog document was produced by Mykl Orders.
 
@@ -198,7 +199,13 @@ let me know if I missed you!
   Microsoft Fortran Compiler, and a Games compendium.
 
 - Martin R has provided substantial help reviewing and improving the
-  User Guide.
+  User Guide and Applications documents.
+
+- Mark Pruden has also contributed a great deal of content to the Disk
+  Catalog, User Guide as well as contributing the disk image for the
+  Z3PLUS operating system, the COPYSL utility, and also implemented a
+  feature for RomWBW configuration by NVRAM, and added the /B bulk mode
+  of disk assignment to the ASSIGN utility.
 
 - Jacques Pelletier has contributed the DS1501 RTC driver code.
 

ReadMe.txt

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-30 Jun 2024
+18 Jan 2025
 
 
 
@@ -112,7 +112,8 @@ drives (IDE disk, CF Card, SD Card, etc.) which then provides even more
 functionality.
 
 Complete instructions for installation and operation of RomWBW are found
-in the RomWBW User Guide.
+in the RomWBW User Guide. It is also a good idea to review the Release
+Notes for helpful release-specific information.
 
 
 Documentation
@@ -122,7 +123,6 @@ Documentation for RomWBW includes:
 -   RomWBW User Guide
 -   RomWBW System Guide
 -   RomWBW Applications
--   RomWBW ROM Applications
 -   RomWBW Errata
 
 
@@ -188,8 +188,8 @@ let me know if I missed you!
 
 -   Tasty Basic is a product of Dimitri Theulings.
 
--   Dean Netherton contributed the sound driver interface and the
-    SN76489 sound driver.
+-   Dean Netherton contributed eZ80 CPU support, the sound driver
+    interface, and the SN76489 sound driver.
 
 -   The RomWBW Disk Catalog document was produced by Mykl Orders.
 
@@ -198,7 +198,13 @@ let me know if I missed you!
     BASIC Compiler, Microsoft Fortran Compiler, and a Games compendium.
 
 -   Martin R has provided substantial help reviewing and improving the
-    User Guide.
+    User Guide and Applications documents.
+
+-   Mark Pruden has also contributed a great deal of content to the Disk
+    Catalog, User Guide as well as contributing the disk image for the
+    Z3PLUS operating system, the COPYSL utility, and also implemented a
+    feature for RomWBW configuration by NVRAM, and added the /B bulk
+    mode of disk assignment to the ASSIGN utility.
 
 -   Jacques Pelletier has contributed the DS1501 RTC driver code.
 

Source/Apps/Build.cmd

@@ -2,48 +2,37 @@
 setlocal
 
 set TOOLS=..\..\Tools
-set APPBIN=..\..\Binary\Apps
 set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 set CPMDIR80=%TOOLS%/cpm/
 
-call :asm syscopy || exit /b
-call :asm assign || exit /b
-call :asm format || exit /b
-call :asm talk || exit /b
-call :asm mode || exit /b
-call :asm rtc || exit /b
-call :asm timer || exit /b
-call :asm rtchb || exit /b
-
-zxcc Z80ASM -SYSGEN/F || exit /b
-
-pushd XM && call Build || exit /b & popd
-pushd FDU && call Build || exit /b & popd
-pushd Tune && call Build || exit /b & popd
-pushd FAT && call Build || exit /b & popd
-pushd Test && call Build || exit /b & popd
-pushd ZMP && call Build || exit /b & popd
-pushd ZMD && call Build || exit /b & popd
-pushd Dev && call Build || exit /b & popd
-pushd VGM && call Build || exit /b & popd
-pushd cpuspd && call Build || exit /b & popd
-pushd Survey && call Build || exit /b & popd
-pushd HTalk && call Build || exit /b & popd
-pushd BBCBASIC && call Build || exit /b & popd
-
-copy *.com %APPBIN%\ || exit /b
+call :build syscopy || exit /b
+call :build assign || exit /b
+call :build format || exit /b
+call :build talk || exit /b
+call :build mode || exit /b
+call :build rtc || exit /b
+call :build timer || exit /b
+call :build sysgen || exit /b
+call :build XM || exit /b
+call :build FDU || exit /b
+call :build Tune || exit /b
+call :build FAT || exit /b
+call :build Test || exit /b
+call :build ZMP || exit /b
+call :build ZMD || exit /b
+call :build Dev || exit /b
+call :build VGM || exit /b
+call :build cpuspd || exit /b
+call :build reboot || exit /b
+call :build Survey || exit /b
+call :build HTalk || exit /b
+call :build BBCBASIC || exit /b
+call :build copysl || exit /b
 
 goto :eof
 
-:asm
-echo.
-echo Building %1...
-tasm -t80 -g3 -fFF %1.asm %1.com %1.lst || exit /b
-goto :eof
-
-:asm180
-echo.
-echo Building %1...
-tasm -t180 -g3 -fFF %1.asm %1.com %1.lst || exit /b
+:build
+echo Building %1
+pushd %1 && call Build || exit /b & popd
 goto :eof

Source/Apps/Clean.cmd

@@ -1,22 +1,32 @@
 @echo off
 setlocal
 
-if exist *.bin del *.bin
-if exist *.com del *.com
-if exist *.lst del *.lst
-if exist *.hex del *.hex
-if exist *.prn del *.prn
+call :clean syscopy || exit /b
+call :clean assign || exit /b
+call :clean format || exit /b
+call :clean talk || exit /b
+call :clean mode || exit /b
+call :clean rtc || exit /b
+call :clean timer || exit /b
+call :clean sysgen || exit /b
+call :clean XM || exit /b
+call :clean FDU || exit /b
+call :clean Tune || exit /b
+call :clean FAT || exit /b
+call :clean Test || exit /b
+call :clean ZMP || exit /b
+call :clean ZMD || exit /b
+call :clean Dev || exit /b
+call :clean VGM || exit /b
+call :clean cpuspd || exit /b
+call :clean reboot || exit /b
+call :clean Survey || exit /b
+call :clean HTalk || exit /b
+call :clean BBCBASIC || exit /b
+call :clean copysl || exit /b
 
-pushd XM && call Clean || exit /b 1 & popd
-pushd FDU && call Clean || exit /b 1 & popd
-pushd Tune && call Clean || exit /b 1 & popd
-pushd FAT && call Clean || exit /b 1 & popd
-pushd Test && call Clean || exit /b 1 & popd
-pushd ZMP && call Clean || exit /b 1 & popd
-pushd ZMD && call Clean || exit /b 1 & popd
-pushd Dev && call Clean || exit /b 1 & popd
-pushd VGM && call Clean || exit /b 1 & popd
-pushd cpuspd && call Clean || exit /b 1 & popd
-pushd Survey && call Clean || exit /b 1 & popd
-pushd HTalk && call Clean || exit /b 1 & popd
-pushd BBCBASIC && call Clean || exit /b 1 & popd
+goto :eof
+
+:clean
+pushd %1 && call Clean || exit /b & popd
+goto :eof

Source/Apps/Makefile

@@ -1,9 +1,5 @@
-OBJECTS = sysgen.com syscopy.com assign.com format.com talk.com \
-	mode.com rtc.com timer.com rtchb.com
-SUBDIRS = HTalk XM FDU FAT Tune Test ZMP ZMD Dev VGM cpuspd Survey BBCBASIC
-DEST = ../../Binary/Apps
+SUBDIRS = HTalk XM FDU FAT Tune Test ZMP ZMD Dev VGM cpuspd reboot Survey BBCBASIC copysl \
+	sysgen syscopy assign format talk mode rtc timer
 TOOLS =../../Tools
 
 include $(TOOLS)/Makefile.inc
-
-USETASM = 1

Source/Apps/Test/2piotst/Build.cmd

@@ -1,10 +1,8 @@
 @echo off
 setlocal
 
-set TOOLS=..\..\..\..\Tools
-
+set TOOLS=../../../../Tools
 set PATH=%TOOLS%\zxcc;%PATH%
-
 set CPMDIR80=%TOOLS%/cpm/
 
 zxcc M80 -=2piotst/l || exit /b

Source/Apps/Test/Build.cmd

@@ -1,41 +1,31 @@
 @echo off
 setlocal
 
-set TOOLS=../../../Tools
-set APPBIN=..\..\Binary\Apps
-
+set TOOLS=..\..\..\Tools
 set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
-
 set TASMTABS=%TOOLS%\tasm32
-
 set CPMDIR80=%TOOLS%/cpm/
 
-pushd DMAmon && call Build || exit /b & popd
-pushd tstdskng && call Build || exit /b & popd
-pushd inttest && call Build || exit /b & popd
-pushd ppidetst && call Build || exit /b & popd
-pushd ramtest && call Build || exit /b & popd
-pushd I2C && call Build || exit /b & popd
-pushd rzsz && call Build || exit /b & popd
-pushd vdctest && call Build || exit /b & popd
-pushd kbdtest && call Build || exit /b & popd
-pushd ps2info && call Build || exit /b & popd
-pushd 2piotst && call Build || exit /b & popd
-pushd piomon && call Build || exit /b & popd
-pushd banktest && call Build || exit /b & popd
-pushd portscan && call Build || exit /b & popd
-pushd sound && call Build || exit /b & popd
+call :build DMAmon || exit /b
+call :build tstdskng || exit /b
+call :build inttest || exit /b
+call :build ppidetst || exit /b
+call :build ramtest || exit /b
+call :build I2C || exit /b
+call :build rzsz || exit /b
+call :build vdctest || exit /b
+call :build kbdtest || exit /b
+call :build ps2info || exit /b
+call :build 2piotst || exit /b
+call :build piomon || exit /b
+call :build banktest || exit /b
+call :build portscan || exit /b
+call :build sound || exit /b
+call :build testh8p || exit /b
 
 goto :eof
 
-:asm
-echo.
-echo Building %1...
-tasm -t80 -g3 -fFF %1.asm %1.com %1.lst || exit /b
-goto :eof
-
-:asm180
-echo.
-echo Building %1...
-tasm -t180 -g3 -fFF %1.asm %1.com %1.lst || exit /b
+:build
+echo Building %1
+pushd %1 && call Build || exit /b & popd
 goto :eof

Source/Apps/Test/Clean.cmd

@@ -22,3 +22,4 @@ pushd piomon && call Clean || exit /b 1 & popd
 pushd banktest && call Clean || exit /b 1 & popd
 pushd portscan && call Clean || exit /b 1 & popd
 pushd sound && call Clean || exit /b 1 & popd
+pushd testh8p && call Clean || exit /b 1 & popd

Source/Apps/Test/DMAmon/dmamon.asm

@@ -362,7 +362,7 @@ SPDDISP:LD	DE,DMA_SPD_STR
 	CALL	PRTIDXDEA
 ;
 	call	PRTSTRD
-	.db	"\n\rTransfer Mode: $"	; DIPLAY TRANSFER
+	.db	"\n\rTransfer Mode: $"	; DISPLAY TRANSFER
 	LD	a,(dmaxfer)		; MODE
 	LD	DE,DMA_XFRMODE
 	CALL	PRTIDXDEA

Source/Apps/Test/I2C/Build.cmd

@@ -5,9 +5,9 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
-tasm -t180 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
-tasm -t180 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
+tasm -t80 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
+tasm -t80 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
+tasm -t80 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
 tasm -t80 -g3 -ff srom.asm srom.com srom.lst || exit /b
 
 copy /Y i2c*.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/Makefile

@@ -1,6 +1,6 @@
-OBJECTS =
-SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info 2piotst piomon banktest portscan sound
-DEST = ../../../Binary/Apps/Test
+# OBJECTS =
+SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info 2piotst piomon banktest portscan sound testh8p
+# DEST = ../../../Binary/Apps/Test
 TOOLS =../../../Tools
 
 include $(TOOLS)/Makefile.inc

Source/Apps/Test/inttest/Build.cmd

@@ -5,7 +5,8 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
+tasm -t80 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
 
 copy /Y inttest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
+copy /Y inttest.doc ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/inttest/Makefile

@@ -1,5 +1,7 @@
 OBJECTS = inttest.com
+DOCS = inttest.doc
 DEST = ../../../../Binary/Apps/Test
+DOCDEST = ../../../../Binary/Apps/Test
 TOOLS =../../../../Tools
 
 USETASM=1

Source/Apps/Test/inttest/inttest.doc

@@ -0,0 +1,44 @@
+INTTEST
+=======
+
+RomWBW includes an API allowing applications to "hook" interrupts.
+The `INTTEST` utility allows you to test this functionality.
+
+
+** Syntax **
+
+`INTTEST`
+
+
+** Usage **
+
+`INTTEST` is an interactive application.  At startup, it will display
+a list of the interrupt vector slots in your system along with the
+current vector address for each of them.
+
+It then prompts you to enter the slot number (in hex) of a vector to
+hook.  After entering this, the application will watch the hooked
+vector and countdown from 0xFF to 0x00 as interrupts are noted.
+
+When the counter reaches 0x00, the interrupt is unhooked and the
+application terminates.  The application can also be terminated by
+pressing <esc>.
+
+
+** Notes **
+
+If your system is running without interrupts active, the application
+will terminate immediately.
+
+All slots have vectors even if the corresponding interrupt is not
+doing anything.  In this case, the vector is pointing to the "bad
+interrupt" handler.
+
+If you hook a vector that is not receiving any interrupts, the
+down-counter will not do anything.
+
+
+** Etymology* *
+
+The `INTTEST` command is an original product and the source code is
+provided in the RomWBW distribution.

Source/Apps/Test/kbdtest/Build.cmd

@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF kbdtest.asm kbdtest.com kbdtest.lst || exit /b
+tasm -t80 -g3 -fFF kbdtest.asm kbdtest.com kbdtest.lst || exit /b
 
 copy /Y kbdtest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/piomon/Build.cmd

@@ -5,6 +5,6 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF piomon.asm piomon.com piomon.lst || exit /b
+tasm -t80 -g3 -fFF piomon.asm piomon.com piomon.lst || exit /b
 
 copy /Y piomon.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/ppidetst/Build.cmd

@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
+tasm -t80 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
 
 copy /Y ppidetst.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/ps2info/Build.cmd

@@ -5,6 +5,6 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF ps2info.asm ps2info.com ps2info.lst || exit /b
+tasm -t80 -g3 -fFF ps2info.asm ps2info.com ps2info.lst || exit /b
 
 copy /Y ps2info.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/ramtest/Makefile

@@ -2,7 +2,7 @@ OBJECTS = ramtest.com
 DEST = ../../../../Binary/Apps/Test
 DOCDEST = ../../../../Doc
 TOOLS = ../../../../Tools
-OTHERS = loader.bin dbgmon.bin
+OTHERS = *.bin
 include $(TOOLS)/Makefile.inc
 
 ramtest.com: loader.bin dbgmon.bin

Source/Apps/Test/testh8p/Build.cmd

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

Source/Apps/Test/testh8p/Clean.cmd

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

Source/Apps/Test/testh8p/Makefile

@@ -0,0 +1,9 @@
+OBJECTS = testh8p.com
+# DOCS = testh8p.doc
+DEST = ../../../../Binary/Apps/Test
+DOCDEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Test/testh8p/testh8p.asm

@@ -0,0 +1,238 @@
+;===============================================================================
+; H8 Panel Test
+;===============================================================================
+;
+;	AUTHOR:  WAYNE WARTHEN (wwarthen@gmail.com)
+;_______________________________________________________________________________
+;
+;
+; Trivial utility to test the register pair display functionality of the
+; Heath H8 Front Panel.
+;
+; Program will display a set of known register values on the console,
+; then go into an infinite loop.  The H8 panel can then be checked to
+; see if the correct values are displayed.
+;
+; There is no way to exit this program.  You must reset your system.
+;
+;===============================================================================
+; Definitions
+;===============================================================================
+;
+stksiz	.equ	$40		; Working stack size
+;
+restart	.equ	$0000		; CP/M restart vector
+bdos	.equ	$0005		; BDOS invocation vector
+;
+regA	.equ	$11
+regBC	.equ	$2233
+regDE	.equ	$4455
+regHL	.equ	$6677
+;
+;===============================================================================
+; Code Section
+;===============================================================================
+;
+;
+	.org	$100
+;
+	; setup stack (save old value)
+	ld	(stksav),sp	; save stack
+	ld	sp,stack	; set new stack
+;
+	ld	de,str_prefix
+	call	prtstr
+;
+	ld	de,str_A
+	ld	hl,regA
+	call	prtreg
+	ld	de,str_BC
+	ld	hl,regBC
+	call	prtreg
+	ld	de,str_DE
+	ld	hl,regDE
+	call	prtreg
+	ld	de,str_HL
+	ld	hl,regHL
+	call	prtreg
+	ld	de,str_SP
+	ld	hl,regSP
+	call	prtreg
+	ld	de,str_PC
+	ld	hl,regPC
+	call	prtreg
+;
+	ld	a,regA
+	ld	bc,regBC
+	ld	de,regDE
+	ld	hl,regHL
+regPC:	jr	$
+;
+;
+;
+prtreg:
+	call	prtstr		; print label
+	ld	a,h		; first byte
+	call	prtoctbyte	; print it
+	ld	a,'.'		; separator
+	call	prtchr		; print it
+	ld	a,l		; second byte
+	call	prtoctbyte	; print it
+	ret
+;
+;
+;
+prtoctbyte:
+	rlca			; 2 ms bits
+	rlca
+	push	af
+	and	%00000011	; isolate
+	add	a,'0'		; make char
+	call	prtchr		; show it
+	pop	af
+	rlca			; next 3 bits
+	rlca
+	rlca
+	push	af
+	and	%00000111	; isolate
+	add	a,'0'		; make char
+	call	prtchr		; show it
+	pop	af
+	rlca			; next 3 bits
+	rlca
+	rlca
+	push	af
+	and	%00000111	; isolate
+	add	a,'0'		; make char
+	call	prtchr		; show it
+	pop	af
+	ret
+;
+; Print character in A without destroying any registers
+;
+prtchr:
+	push	bc		; save registers
+	push	de
+	push	hl
+	ld	e,a		; character to print in E
+	ld	c,$02		; BDOS function to output a character
+	call	bdos		; do it
+	pop	hl		; restore registers
+	pop	de
+	pop	bc
+	ret
+;
+; Print a zero terminated string at (DE) without destroying any registers
+;
+prtstr:
+	push	de
+;
+prtstr1:
+	ld	a,(de)		; get next char
+	or	a
+	jr	z,prtstr2
+	call	prtchr
+	inc	de
+	jr	prtstr1
+;
+prtstr2:
+	pop	de		; restore registers
+	ret	
+;
+; Start a new line
+;
+crlf2:
+	call	crlf		; two of them
+crlf:
+	push	af		; preserve AF
+	ld	a,13		; <CR>
+	call	prtchr		; print it
+	ld	a,10		; <LF>
+	call	prtchr		; print it
+	pop	af		; restore AF
+	ret
+;
+; Print the value in A in hex without destroying any registers
+;
+prthex:
+	push	af		; save AF
+	push	de		; save DE
+	call	hexascii	; convert value in A to hex chars in DE
+	ld	a,d		; get the high order hex char
+	call	prtchr		; print it
+	ld	a,e		; get the low order hex char
+	call	prtchr		; print it
+	pop	de		; restore DE
+	pop	af		; restore AF
+	ret			; done
+;
+; print the hex word value in hl
+;
+prthexword:
+	push	af
+	ld	a,h
+	call	prthex
+	ld	a,l
+	call	prthex 
+	pop	af
+	ret
+;
+; print the hex dword value in de:hl
+;
+prthex32:
+	push	bc
+	push	de
+	pop	bc
+	call	prthexword
+	push	hl
+	pop	bc
+	call	prthexword
+	pop	bc
+	ret
+;
+; Convert binary value in A to ascii hex characters in DE
+;
+hexascii:
+	ld	d,a		; save A in D
+	call	hexconv		; convert low nibble of A to hex
+	ld	e,a		; save it in E
+	ld	a,d		; get original value back
+	rlca			; rotate high order nibble to low bits
+	rlca
+	rlca
+	rlca
+	call	hexconv		; convert nibble
+	ld	d,a		; save it in D
+	ret			; done
+;
+; Convert low nibble of A to ascii hex
+;
+hexconv:
+	and	$0F	     	; low nibble only
+	add	a,$90
+	daa	
+	adc	a,$40
+	daa	
+	ret
+;
+;===============================================================================
+; Storage Section
+;===============================================================================
+;
+rtcbuf	.fill	6,$FF		; RTC data buffer
+;
+str_prefix	.db	"\r\n\r\nRegisters: ",0
+;
+str_A		.db	"A=",0
+str_BC		.db	", BC=",0
+str_DE		.db	", DE=",0
+str_HL		.db	", HL=",0
+str_SP		.db	", SP=",0
+str_PC		.db	", PC=",0
+;
+stksav	.dw	0		; stack pointer saved at start
+	.fill	stksiz,0	; stack
+stack	.equ	$		; stack top
+regSP:
+;
+	.end

Source/Apps/Test/tstdskng/Build.cmd

@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
+tasm -t80 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
 
 copy /Y tstdskng.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/vdctest/Build.cmd

@@ -5,8 +5,8 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF vdctest.asm vdctest.com vdctest.lst || exit /b
-tasm -t180 -g3 -fFF vdconly.asm vdconly.com vdconly.lst || exit /b
+tasm -t80 -g3 -fFF vdctest.asm vdctest.com vdctest.lst || exit /b
+tasm -t80 -g3 -fFF vdconly.asm vdconly.com vdconly.lst || exit /b
 
 copy /Y vdctest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 copy /Y vdconly.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Tune/Build.cmd

@@ -5,9 +5,9 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF -dWBW tune.asm tune.com tune.lst || exit /b
-tasm -t180 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst || exit /b
-tasm -t180 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW tune.asm tune.com tune.lst || exit /b
+tasm -t80 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst || exit /b
+tasm -t80 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst || exit /b
 
 copy /Y tune*.com ..\..\..\Binary\Apps\ || exit /b
 copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ || exit /b

Source/Apps/Tune/cli.inc

@@ -23,6 +23,26 @@ CLI_HAVE_HBIOS_SWITCH1			; NOT MATCHED --HBIOS
 	LD	(HBIOSMD), A
 	RET
 
+CLI_PORTS:
+ 	LD	HL, CLIARGS		; TEST FOR -MSX ON COMMAND LINE
+	LD	DE, OPT_MSX
+	CALL	STRINDEX
+	JR	NZ, CLI_PORTS1
+	LD	A,PORTS_MSX
+	JR	CLI_PORTS_Z
+CLI_PORTS1:
+ 	LD	HL, CLIARGS		; TEST FOR -RC ON COMMAND LINE
+	LD	DE, OPT_RC
+	CALL	STRINDEX
+	JR	NZ, CLI_PORTS2
+	LD	A,PORTS_RC
+	JR	CLI_PORTS_Z
+CLI_PORTS2:
+	LD	A,PORTS_AUTO		; USE AUTO PORT SELECTION
+CLI_PORTS_Z:
+	LD	(USEPORTS),A		; SAVE PORTS SELECTION
+	RET
+
 CLI_ABRT_UNSUPPFILTYP:
 	PUSH	AF
 	ISHBIOS
@@ -79,6 +99,8 @@ CLI_OCTAVE_ADJST5:
 	LD	(OCTAVEADJ), A
 	RET
 
+OPT_MSX		.DB	"-MSX", 0			; USE MSX PORTS
+OPT_RC		.DB	"-RC", 0			; USE RC PORTS
 HBIOSOPT:	.DB	"--HBIOS", 0
 DOWN1		.DB	"-t1", 0			; DOWN AN OCTAVE
 DOWN2		.DB	"-t2", 0			; DOWN TWO OCTAVE

Source/Apps/Tune/tune.asm

@@ -49,6 +49,10 @@
 ;   2024-02-23 [WBW] Include ACR value in config table
 ;   2024-04-16 [WBW] Add support for NABU AY-3-8910
 ;   2024-05-10 [WBW] Hack to avoid corrupting bits 6&7 of PSG R7 for NABU!
+;   2024-07-08 [WBW] Add support for Les Bird's Graphics, Sound, Joystick
+;   2024-07-11 [WBW] Updated, Les Bird's module now uses same settings as EB6
+;   2024-09-17 [WBW] Add support for HEATH H8 with Les Bird's MSX Card
+;   2024-12-12 [WBW] Add options to force standard MSX or RC ports
 ;_______________________________________________________________________________
 ;
 ; ToDo:
@@ -70,6 +74,10 @@ TYPPT2		.EQU	1		; FILTYP value for PT2 sound file
 TYPPT3		.EQU	2		; FILTYP value for PT3 sound file
 TYPMYM		.EQU	3		; FILTYP value for MYM sound file
 ;
+PORTS_AUTO	.EQU	0		; AUTO select audio chip ports
+PORTS_MSX	.EQU	1		; force MSX audio chip ports
+PORTS_RC	.EQU	2		; force RCBUS audio chip ports
+;
 ; HIGH SPEED CPU CONTROL
 ;
 SBCV2004	.EQU	0		; ENABLE SBC-V2-004 HALF CLOCK DIVIDER
@@ -103,6 +111,7 @@ Id		.EQU	1	; 5) Insert official identificator
 	PRTSTRDE(MSGBAN)		; Print to banner message
 
 	CALL	CLI_ABRT_IF_OPT_FIRST
+	CALL	CLI_PORTS
 	CALL	CLI_HAVE_HBIOS_SWITCH
 	CALL	CLI_OCTAVE_ADJST
 	JP	CONTINUE
@@ -122,6 +131,22 @@ CONTINUE:
 	OR	A
 	JR	NZ, TSTTIMER		; skip hardware check if using hbios
 
+	LD	A, (USEPORTS)		; get ports option
+	LD	HL,MSXPORTS		; assume MSX
+	CP	PORTS_MSX		; use MSX?
+	JR	Z,FORCE
+	LD	HL,RCPORTS		; asssume RC
+	CP	PORTS_RC		; use RC?
+	JR	Z,FORCE
+	JR	AUTOSEL			; otherwise do auto select
+
+FORCE:
+	LD	BC,CFGSIZ		; Size of one entry
+	LD	DE,CFG			; Active config structure
+	LDIR				; Update active config structure
+	JR	MAT			; Continue
+
+AUTOSEL:
 	LD	HL,CFGTBL		; Point to start of config table
 CFGSEL:
 	LD	A,$FF			; End of table marker
@@ -572,8 +597,8 @@ CFGSIZ	.EQU	$ - CFGTBL
 	.DB	$07,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$07,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB Rev 6)
-	.DW	HWSTR_RCEB6
+	.DB	$07,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
 	.DB	$07,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
@@ -584,8 +609,8 @@ CFGSIZ	.EQU	$ - CFGTBL
 	.DB	$08,	$68,	$60,	$68,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$08,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (EB Rev 6)
-	.DW	HWSTR_RCEB6
+	.DB	$08,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
 	.DB	$08,	$61,	$60,	$60,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
@@ -596,8 +621,8 @@ CFGSIZ	.EQU	$ - CFGTBL
 	.DB	$09,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$09,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB Rev 6)
-	.DW	HWSTR_RCEB6
+	.DB	$09,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
 	.DB	$09,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
@@ -608,8 +633,8 @@ CFGSIZ	.EQU	$ - CFGTBL
 	.DB	$0A,	$68,	$60,	$68,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$0A,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (EB Rev 6)
-	.DW	HWSTR_RCEB6
+	.DB	$0A,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (MS6)
+	.DW	HWSTR_RCMSX
 ;
 	.DB	$0A,	$61,	$60,	$60,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
@@ -620,8 +645,8 @@ CFGSIZ	.EQU	$ - CFGTBL
 	.DB	$0B,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$0B,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB Rev 6)
-	.DW	HWSTR_RCEB6
+	.DB	$0B,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
 	.DB	$0B,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
@@ -634,12 +659,26 @@ CFGSIZ	.EQU	$ - CFGTBL
 ;
 	.DB	17,	$A4,	$A5,	$A4,	$FF,	$A6,	$FE	; DUODYNE
 	.DW	HWSTR_DUO
+;
+	.DB	18,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; HEATH H8
+	.DW	HWSTR_HEATH
 ;
 	.DB	22,	$41,	$40,	$40,	$FF,	$FF,	$FF	; NABU
 	.DW	HWSTR_NABU
 ;
 	.DB	$FF					; END OF TABLE MARKER
 ;
+; The following are table entries (like above), but not part of auto
+; detection searching.  They are selected byh command line options.
+;
+MSXPORTS:
+	.DB	$FF,	$A0,	$A1,	$FF,	$FF,	$FF,	$FF	; GENERIC MSX
+	.DW	HWSTR_MSX
+;
+RCPORTS:
+	.DB	$FF,	$D8,	$D0,	$FF,	$FF,	$FF,	$FF	; GENERIC RC
+	.DW	HWSTR_RC
+;
 CFG:		; ACTIVE CONFIG VALUES (FROM SELECTED CFGTBL ENTRY)
 PLT		.DB	0	; RomWBW HBIOS platform id
 PORTS:
@@ -666,11 +705,13 @@ TMP		.DB	0	; work around use of undocumented Z80
 HBIOSMD		.DB	0	; NON-ZERO IF USING HBIOS SOUND DRIVER, ZERO OTHERWISE
 OCTAVEADJ	.DB	0	; AMOUNT TO ADJUST OCTAVE UP OR DOWN
 
-MSGBAN		.DB	"Tune Player for RomWBW v3.8, 10-May-2024",0
+USEPORTS	.DB	0	; AUDIO CHIP PORT SELECTION MODE
+
+MSGBAN		.DB	"Tune Player for RomWBW v3.12, 12-Dec-2024",0
 MSGUSE		.DB	"Copyright (C) 2024, Wayne Warthen, GNU GPL v3",13,10
 		.DB	"PTxPlayer Copyright (C) 2004-2007 S.V.Bulba",13,10
 		.DB	"MYMPlay by Marq/Lieves!Tuore",13,10,13,10
-		.DB	"Usage: TUNE <filename>.[PT2|PT3|MYM] [--hbios] [+tn|-tn]",0
+		.DB	"Usage: TUNE <filename>.[PT2|PT3|MYM] [-msx|-rc] [--hbios] [+tn|-tn]",0
 MSGBIO		.DB	"Incompatible BIOS or version, "
 		.DB	"HBIOS v", '0' + RMJ, ".", '0' + RMN, " required",0
 MSGPLT		.DB	"Hardware error, system not supported!",0
@@ -687,12 +728,15 @@ MSGERR		.DB	"App Error", 0
 HWSTR_SCG	.DB	"SCG ECB Board",0
 HWSTR_N8	.DB	"N8 Onboard Sound",0
 HWSTR_RCEB	.DB	"RCBus Sound Module (EB)",0
-HWSTR_RCEB6	.DB	"RCBus Sound Module (EBv6)",0
+HWSTR_RCMSX	.DB	"RCBus Sound Module (MSX)",0
 HWSTR_RCMF	.DB	"RCBus Sound Module (MF)",0
 HWSTR_LINC	.DB	"Z50 LiNC Sound Module",0
 HWSTR_MBC	.DB	"NHYODYNE Sound Module",0
 HWSTR_DUO	.DB	"DUODYNE Sound Module",0
 HWSTR_NABU	.DB	"NABU Onboard Sound",0
+HWSTR_HEATH	.DB	"HEATH H8 MSX Module",0
+HWSTR_MSX	.DB	"MSX Standard Ports (A0H/A1H)",0
+HWSTR_RC	.DB	"RCBus Standard Ports (D8H/D0H)",0
 
 MSGUNSUP	.db	"MYM files not supported with HBIOS yet!\r\n", 0
 

Source/Apps/VGM/Build.cmd

@@ -5,8 +5,8 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF -dWBW vgmplay.asm vgmplay.com vgmplay.lst || exit /b
-tasm -t180 -g3 -fFF -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW vgmplay.asm vgmplay.com vgmplay.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst || exit /b
 
 copy /Y vgmplay.com ..\..\..\Binary\Apps\ || exit /b
 copy /Y Tunes\*.vgm ..\..\..\Binary\Apps\Tunes\ || exit /b

Source/Apps/XM/xmdm125.asm

@@ -3478,7 +3478,17 @@ RSDMA:	LXI	D,TBUF		; Reset DMA address
 	RET
 ;
 WRERR:	CALL	RSDMA		; Reset DMA to normal
-	MVI	C,CAN		; Cancel
+; [WBW] BEGIN: Fixed to put CAN character in A instead of C because
+; SEND uses the A register.  Also increased number of CAN characters
+; sent to 3.  Credit to HubertH for finding this and providing the fix.
+;	MVI	C,CAN		; Cancel
+; [WBW] -----
+	MVI	A,CAN		; Cancel
+	CALL	SEND		; Sender
+	MVI	A,CAN		; Cancel
+	CALL	SEND		; Sender
+	MVI	A,CAN		; Cancel
+; [WBW] END
 	CALL	SEND		; Sender
 ; [WBW] BEGIN: RCVSABT does not return, so file write error
 ; message was never being displayed.  Swapped things around

Source/Apps/assign/Build.cmd

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

Source/Apps/assign/Clean.cmd

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

Source/Apps/assign/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = assign.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/assign/assign.asm

@@ -11,6 +11,8 @@
 ;     ex: ASSIGN		(display all active drive assignments)
 ;         ASSIGN /?		(display version and usage)
 ;         ASSIGN /L		(display all possible devices)
+;         ASSIGN /B=OPTS	(perform assignment based on options)
+;         ASSIGN C:		(display assignment for C:)
 ;         ASSIGN C:=D:		(swaps C: and D:)
 ;         ASSIGN C:=FD0:	(assign C: to floppy unit 0)
 ;         ASSIGN C:=IDE0:1	(assign C: to IDE unit0, slice 1)
@@ -33,6 +35,9 @@
 ;   2023-06-19 [WBW] Update for revised DIODEVICE API
 ;   2023-09-19 [WBW] Added CHUSB & CHSD device support
 ;   2023-10-13 [WBW] Fixed DPH creation to select correct DPB
+;   2024-12-17 [MAP] Added new /B=opt feaure to assign drives
+;   2024-12-21 [MAP] Added CBIOS heap estimation to /B to prevent
+;                    overflow when the drives are finally added
 ;_______________________________________________________________________________
 ;
 ; ToDo:
@@ -51,7 +56,8 @@ bnksel	.equ	$FFF3		; HBIOS bank select vector
 ;
 stamp	.equ	$40		; loc of RomWBW CBIOS zero page stamp
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
+#include "../../HBIOS/hbios.inc"
 ;
 ;===============================================================================
 ; Code Section
@@ -80,7 +86,7 @@ start:
 	call	init		; initialize
 	jr	nz,exit		; abort if init fails
 ;
-	; do the real work 
+	; do the real work
 	call	process		; parse and process command line
 	jr	nz,exit		; done if error or no action
 ;
@@ -160,12 +166,14 @@ init:
 	ld	e,(hl)		; dereference HL
 	inc	hl		; ... into DE to get
 	ld	d,(hl)		; ... DPB map pointer
-	ld	(dpbloc),de	; and save it	
+	ld	(dpbloc),de	; and save it
 ;
 	; test for CP/M 3 and branch if so
 	ld	a,(cpmver)	; low byte of cpm version
 	cp	$30		; CP/M 3.0?
 	jp	nc,initcpm3	; handle CP/M 3.0 or greater
+;
+; CP/M 2.2 (CBIOS) initialization
 ;
 	; make a local working copy of the drive map
 	ld	hl,(maploc)	; copy from CBIOS drive map
@@ -215,6 +223,13 @@ initx:
 	add	hl,de		; adjust
 	ld	(heaplim),hl	; save it
 ;
+	; establish remaining heap, used for estimation during /b
+	ld	de,(maploc)	; start of free heap space
+	or	a		; clear carry
+	sbc	hl,de		; upper heap - start of heap = size
+	ld	de,SIZ_DBUF	; 128 bytes for directory buffer
+	sbc	hl,de		; less directory buffer overhead
+	ld	(heaprem),hl	; save heap size that can be allocated
 #if 0
 	ld	a,' '
 	call	crlf
@@ -229,7 +244,9 @@ initx:
 	call	prtchr
 	ld	bc,(heaplim)
 	call	prthexword
-	
+	call	prtchr
+	ld	bc,(heaprem)
+	call	prthexword
 #endif
 ;
  	; return success
@@ -253,7 +270,7 @@ initcpm3:
 	; switch to sysbnk
 	ld	a,($FFE0)	; get current bank
 	push	af		; save it
-	ld	bc,$F8F2	; HBIOS Get Bank Info
+	ld	bc,BC_SYSGET_BNKINFO ; HBIOS Get Bank Info
 	rst	08		; call HBIOS, E=User Bank
 	ld	a,e		; HBIOS User Bank
 	call	bnksel		; HBIOS BNKSEL
@@ -282,7 +299,7 @@ initc3:
 	inc	de		; bump to slice
 	ld	a,(hl)		; get slice from drvtbl
 	ld	(de),a		; save slice to drvmap
-initc4:	
+initc4:
 	inc	de		; bump past slice
 	inc	de		; skip
 	inc	de		; ... dph
@@ -399,6 +416,8 @@ option:
 	ld	a,(hl)		; get it
 	cp	'?'		; is it a '?' as expected?
 	jp	z,usage		; yes, display usage
+	cp	'B'		; assign Boot Hard Drive Slices
+	jp	z,bootdr	; yes, assign boot drive slices
 	cp	'L'		; is it a 'L', display device list?
 	jp	z,devlist	; yes, display device list
 	jp	errprm		; anything else is an error
@@ -438,9 +457,8 @@ devlist:
 	or	a		; set flags
 	jr	nz,devlstu	; do UNA mode dev list
 ;
-	ld	b,$F8		; hbios func: sysget
-	ld	c,$10		; sysget subfunc: diocnt
-	rst	08		; call hbios, E := device count 
+	ld	bc,BC_SYSGET_DIOCNT ; hbios func: sysget subfunc: diocnt
+	rst	08		; call hbios, E := device count
 	ld	b,e		; use device count for loop count
 	ld	c,0		; use C for device index
 devlist1:
@@ -486,6 +504,496 @@ devlstu1:
 	djnz	devlstu1	; loop as needed
 	ret			; return
 ;
+; -------------------------------------------------
+; /B=XXX - Bootup drive Assignment
+;
+; Variable used across the entire bootdr: function
+; - (mapwrk) working table of assignments
+; - (mapadr) pointer to next drive assignment in mapwrk
+; - (dstdrv) Drive letter of next assigment 0-15
+; - (tmpstr) List of Option letters being processed
+;
+bootdr:
+	; command line processing mapping options into (tmpstr)
+	inc	hl		; next char after the /B expect a delimeter
+	call	nonblank	; skip ws
+	cp	'='
+	inc	hl
+	call	nonblank	; skip ws
+	call	getalpha	; options string into (tmpstr)
+;
+	; defaulting loop for normal disk boot starting at A:
+	ld	hl,mapwrk	; DE := working drive map
+	ld	(mapadr),hl	; save pointer o next drive maping
+	xor	a		; next dest drive letter start at A:
+	ld	(dstdrv),a
+bootdr1:
+	; process next letter in the cmd line options
+	ld	a,(tmpstr)	; next letter
+	res	5,a		; FORCE UPPERCASE (IMPERFECTLY)
+	; Case Statement
+	ld	hl,bootdr2	; return address for below JP
+	push	hl		; when RET from below JP, return
+	cp	'A'
+	jp	z,bootdra	; RAM
+	cp	'B'
+	jp	z,bootdrb	; BOOT
+	cp	'F'
+	jp	z,bootdrf	; FLOPPY
+	cp	'H'
+	jp	z,bootdrh	; HARD DRIVES (improved)
+	cp	'L'
+	jp	z,bootdrl	; HARD DRIVES (legacy)
+	cp	'O'
+	jp	z,bootdro	; ROM
+	cp	'P'
+	jp	z,bootdrp	; PRESERVE/KEEP (SKIP)
+	cp	'S'
+	jp	z,bootdrs	; SLICES (OFF BOOT DRIVE)
+	cp	'X'
+	jp	z,bootdrx	; UNASSIGN
+	cp	'Z'
+	jp	z,bootdrz	; UNASSIGN ALL REMAINING
+	; no valid option was found just ignore and continue
+	; potentially signal an error
+	pop	hl		; remove the return address, since no match
+bootdr2:
+	jr	c,bootdr4	; if overflowed, exhaused drives then error
+	; bump to next letter in tmp str, by shifing string left in buffer
+	ld	hl,tmpstr+1	; copy from +1 in buffer
+	ld	a,(hl)		; copy next char for Z check
+	ld	de,tmpstr	; copy down to +0 in buffer
+	ld	bc,16		; buffer is 16 bytes
+	ldir
+	or	a		; set flags based on next char
+	jr	nz,bootdr1	; loop if character found
+bootdr3:
+	xor	a		; success
+	ret			; finished
+bootdr4:
+	or	$ff		; failure
+	ret			; finished
+;
+; -------------------------------------------------
+; /B=XXX AGORITHMS START HERE
+;
+; PRESERVE, SKIP 1, JUST LOOP
+bootdrp:
+	; determine the drive being preserved, calc estimate
+	ld	hl,(mapadr)	; address of next map entry in table. Indirect
+	ld	a,(hl)		; the unit number of drive being skipped
+	call	bootdest	; for unit in A, calc the heap estimate -> DE
+	; subtract bytes from estimate, not not checking for overflow
+	ld	hl,(heaprem)	; remaing heap estimate
+	or	a		; clear carry
+	sbc	hl,de		; subtract slice from heap estimate
+	ld	(heaprem),hl	; update estimate based on adding slice
+	; and skip to next drive
+	call	bootinc		; Skip to next drive letter
+	ret			; Finished
+;
+; EXCLUDE / UNASSIGNED / GAP
+bootdrx:
+	ld	a,$FF		; $FF (unit) signal a drive not assigned
+	ld	(unit),a	; set unit
+	xor	a		; slice 0
+	ld	(slice),a	; save as slice to assign.
+	ld	hl,SIZ_DMAP	; heap used is 4 bytes for drvmap entry only
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	call	bootadd 	; assign the slice
+	ret			; Finished, returning error
+;
+; EXCLUDE / UNASSIGNED - ALL REMAINING
+bootdrz:
+	ld	a,$FF		; $FF (unit) signal a drive not assigned
+	ld	(unit),a	; set unit
+	xor	a		; slice 0
+	ld	(slice),a	; save as slice to assign.
+	ld	hl,0		; all remainging drives consume 0 bytes
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+bootdrz1:
+	call	bootadd 	; assign the slice
+	jr	nc,bootdrz1	; NC still can continue to allocate
+	xor	a		; success
+	ret			; Finished
+;
+; BOOT DRIVE
+bootdrb:
+	ld	bc,BC_SYSGET_BOOTINFO	; HBIOS SysGet; BootInfo
+	rst	08		; Get boot disk unit/slice in DE
+	ld	a,e		; boot slice returned in E
+	ld	(slice),a	; save as slice to assign.
+	ld	a,d		; boot unit id returned in D
+	ld	(unit),a	; save as unit number
+	call	bootdest	; calc estimat of unit A store in (sliceem)
+	call	bootadd 	; add the boot drive slice
+	ret			; Finished, returning error
+;
+; RAM DRIVE
+bootdra:
+	ld	a,$FF		; specific mask to include all BITS
+	ld	(atrmask),a	; mask for device attributes
+	ld	a,%00010101	; specific mask for RAM DRIVE.
+	ld	(atrcomp),a	; compare to after mask
+	ld	hl,EST_MD	; estimate of heap used. for RAM ROM
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	call	bootadds	; do single slice assignment
+	ret			; Finished, returning error
+;
+; ROM DRIVE
+; Note: if MDFFENABLE is enabled, this wont select the ROM since the
+; driver returns MD_AFSH (%00010111), and we cannot generalise this mask
+bootdro:
+	ld	a,%11111101	; ROM mask, excluding Bit 1, which varies
+	ld	(atrmask),a	; mask for device attributes
+	ld	a,%00010100	; for values "MD_AROM", "MD_AFSH"; Att="000101x0"
+	ld	(atrcomp),a	; compare to after mask
+	ld	hl,EST_MD	; estimate of heap used. for RAM ROM
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	call	bootadds	; do single slice assignment
+	ret			; Finished, returning error
+;
+; FLOPPY DRIVE(S)
+bootdrf:
+	ld	a,%11000000	; device parameters (Removable Floppy)
+	ld	(atrmask),a	; mask for device attributes
+	ld	(atrcomp),a	; compare to after mask
+	ld	hl,EST_FD	; estimate of heap used. for Floppy
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	call	bootadds	; do single slice assignment
+	ret			; Finished, returning error
+;
+; SLICES (From Boot Drive Only)
+bootdrs:
+	; find the boot drive, save unit /slice number
+	ld	a,(mapwrk)	; boot drive unit number
+	ld	(unit),a	; save as unit number to assign
+	ld	hl,EST_HD	; estimate of heap used, for HDD
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	ld	a,0		; starting slice number
+bootdrs1:
+	; A is next slice to assign when entering here
+	ld	(slice),a	; save as slice to assign.
+	call	bootadd 	; add the slice, return Z - past the last drive
+	jr	c,bootdrs2	; drives exhaused, finish up
+	ld	a,(slice)	; get the slice just consumed
+	inc	a		; next slice
+	JR	bootdrs1	; loop round
+bootdrs2:
+	xor	a		; success
+	ret
+;
+; HARD DRIVE(S) - Improved from CBIOS - More Drives
+bootdrh:
+	ld	a,%00100000	; device parameters (High Capacity)
+	ld	(atrmask),a	; mask for device attributes
+	ld	(atrcomp),a	; compare to after mask
+	ld	hl,EST_HD	; estimate of heap used, for HDD
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	; count the number of drives matching criteria
+	call	bootcnt		; return Drive count in A
+	; compute Slices per volume from drv count in A
+	call	bootdrh1	; return SPV in A
+	ld	(slicec),a	; slice per volume count
+	; do the drive assignment
+	call	bootaddn	; do the drive assignment
+	ret			; Finished returning error
+;
+; Input A contains device count return SPV (slices per volume) in A
+bootdrh1:
+	ld	e,a		; divide by by e, the number of devices
+	ld	a,(dstdrv)	; next destination drive to map, 0-15
+	ld	d,a		; put it in d
+	ld	a,16 		; total number of drives
+	sub	d		; less assigned = remaining
+	; above assumes we have space remaining on heap for all drives
+	; ideally should take A=Min( A, (heaprem)/EST_HD ) before division
+	ld	d,a		; divides d - remaing drives
+; The following routine divides d by e and places the quotient in d and the remainder in a
+; https://wikiti.brandonw.net/index.php?title=Z80_Routines:Math:Division
+	xor	a
+	ld	b, 8
+bootdrh2:
+	sla	d
+	rla
+	cp	e
+	jr	c, $+4
+	sub	e
+	inc	d
+	djnz	bootdrh2
+	ld	a,d		; end of the division the quotiant in A
+	ret			; return it
+;
+; HARD DRIVE(S) - Legacy (from CBIOS)
+bootdrl:
+	ld	a,%00100000	; device parameters (High Capacity)
+	ld	(atrmask),a	; mask for device attributes
+	ld	(atrcomp),a	; compare to after mask
+	ld	hl,EST_HD	; estimate of heap used, for HDD
+	ld	(slicmem),hl	; save estmate so heap space can be counted
+	;
+	; count the number of drives matching criteria
+	call	bootcnt		; return Drive count in A
+	;
+	; compute Slices per volume from drv count in A
+	call	bootdrl1	; return SPV in A
+	ld	(slicec),a	; slice per volume count
+	;
+	; do the drive assignment
+	call	bootaddn	; do the drive assignment
+	xor	a		; Success
+	ret			; Finished
+;
+; Input A contains device count return SPV (slices per volume) in A
+bootdrl1:
+	ld	e,8		; ASSUME 8 SLICES PER VOLUME
+	dec	a		; DEC ACCUM TO CHECK FOR COUNT = 1
+	jr	z,bootdrl2	; YES, SKIP AHEAD TO IMPLEMENT 8 HDSPV
+	ld	e,4		; NOW ASSUME 4 SLICES PER VOLUME
+	dec	a		; DEC ACCUM TO CHECK FOR COUNT = 2
+	jr	z,bootdrl2	; YES, SKIP AHEAD TO IMPLEMENT 4 HDSPV
+	ld	e,2		; IN ALL OTHER CASES, WE USE 2 HDSPV
+bootdrl2:
+	ld	a,e
+	ret
+;
+; -------------------------------------------------
+; Memory allocation estimates for each device type
+;
+SIZ_DBUF	.EQU 	128		; actual size of directory buffer
+SIZ_DPH		.EQU	20		; actual size of a DPH structure
+SIZ_DMAP	.EQU	4		; actual bytes per drvmap entry
+;
+EST_FIXED	.EQU	SIZ_DPH+SIZ_DMAP ; overhead for all assignments
+;
+EST_MD		.EQU	EST_FIXED + 24	; estimated size for ram/rom
+EST_FD		.EQU	EST_FIXED + 192 ; estimated size for floppy
+EST_HD		.EQU	EST_FIXED + 256 ; estimated size hdd (CKS/ALS)
+;
+; -------------------------------------------------
+; /B=XXX - General Purpose Functions
+;
+; Determine Slice Estimate for Unit in A reg
+; storing estimate in (slicmem), and DE
+;
+bootdest:
+	; is it assigned
+	ld	c,a		; store unit (passed in A) for hbios call
+	ld	de,SIZ_DMAP	; assume unassigned, 4 bytes for drvmap
+	cp	$FF		; unassigned?
+	jr	z,bootdest2	; finished at this point.
+	; check for UNA mode, before calling HBIOS
+	ld	a,(unamod)	; get UNA mode flag, and set Flags
+	or	a		; if UNA Mode then dont do hbios lookup
+	jr	nz,bootdest1	; use worst case scenario (future una call)
+	; determine device type by hbios lookup
+	ld	b,BF_DIODEVICE  ; get device info
+	rst	08		; Note C was set above
+	; now work out the bytes to allocate
+	ld	a,d		; device type to A
+	ld	de,EST_MD	; assume md size
+	cp	DIODEV_MD	; ram/rom MD device
+	jr	z,bootdest2	; finished at this point
+	ld	de,EST_FD	; assume floppy
+	cp	DIODEV_FD	; floppy device
+	jr	z,bootdest2	; finished at this point
+bootdest1:
+	ld	de,EST_HD	; otherwise assume HD
+bootdest2:
+	ld	(slicmem),de
+	ret
+;
+; Count Number of Devices
+; (atrmask) mask the device attribtes
+; (atrcomp) compare to set zero flag
+; return A number of drives mathing the attributes
+bootcnt:
+	; loop thru hbios units looking for device type/unit match
+	ld	bc,BC_SYSGET_DIOCNT ; hbios func: sysget subfunc: diocnt
+	rst	08		; call hbios, E := device count
+	ld	b,e		; use device count for loop count
+	ld	c,0		; use C for device index C = 0
+	ld	l,0		; will contain the drive count
+bootcnt1:
+	call	bootmat		; perform the match on device C, Z if match
+	jr	nz,bootcnt2	; not matching, skip and continue loop
+	inc	l		; same so incrment the counter
+bootcnt2:
+	inc	c		; next drive letter
+	djnz	bootcnt1	; loop
+	ld	a,l		; return the count in A register
+	or	a		; ensure registers are set correctly
+	ret			; Finished
+;
+; Loop though all devices add a single slice based on device attributes
+; See method below for documentation. Noting (slice) is defaulted to 1
+bootadds
+	ld	a,1
+	ld	(slicec),a
+	; fall through to bootaddn
+;
+; Loop though all devices add N slice(s) based on device attributes
+; (atrmask) mask the device attribtes
+; (atrcomp) compare to set zero flag
+; (slicec) number of slices
+; return C flag
+;   C have expended all drives
+;  NC still can continue to allocate
+;   Z otherwise successfully completed
+bootaddn
+	; loop thru hbios units looking for device type/unit match
+	ld	bc,BC_SYSGET_DIOCNT ; hbios func: sysget subfunc: diocnt
+	rst	08		; call hbios, E := device count
+	ld	b,e		; use device count for loop count
+	ld	c,0		; use C for device index C = 0
+bootaddn1:
+	call	bootmat		; perform the match on device C, Z if match
+	jr	nz,bootaddn4	; not same skip volume, continue loop
+	; save the disk unit
+	ld	a,c		; get the unit id back into A
+	ld	(unit),a	; unit to add, if we add it.
+	; setup inner loop
+	push	bc		; save loop control for outer loop
+	ld	a,(slicec)	; count of slices to assign
+	ld	b,a		; use device count for loop count
+	ld	c,0		; use C for slice index slice = 0
+bootaddn2:
+	; entering here C contains updated slice
+	ld	a,c		; slice number
+	ld 	(slice),a	; slice number
+	; assign the slice and loop
+	push	bc		; save loop control
+	call	bootadd 	; add the slice
+	pop	bc		; restore loop
+	jr	c,bootaddn3	; if bootadd, ran out of drives to allocate
+	inc	c		; next slice
+	djnz	bootaddn2	; inner loop
+bootaddn3:
+	; finish inner loop for next disk unit
+	pop	bc		; restore loop control for outer
+	ret	c		; return if no drives left to allocate
+bootaddn4:
+	; continue looping to next unit
+	inc	c		; next device
+	djnz	bootaddn1	; outer loop
+	xor	a		; success
+	ret			; Finished
+;
+; Add a Single Drive.
+; based on (unit) and (slice) variables
+; This routine will skip if drive already assigned
+; return C flag
+;   C have expended all drives
+;  NC still can continue to allocate
+bootadd:
+	; check we are not already past last (P:) drive
+	ld	hl,dstdrv	; destination drive
+	ld	a,15
+	cp	(hl)		; C set if >= 16
+	ret	c		; Return with carry, cannot assign.
+	; do we need to perform duplicate check
+	ld	a,(dstdrv)	; next destination drive to map, could be A: (=0)
+	or	a		; is it A:
+	jr	z,bootadd1	; nothing to check  we are assigning the A: drive
+	; perform duplicate check before assignment
+	ld	b,a		; B number of entries to check
+	ld	hl,mapwrk	; HL point to working drive map table to compare to
+	ld	de,unit		; DE comparison, unit/slice are ordered (psudo mapwrk entry)
+	call	valid3		; perform a duplicate check (REUSED)
+	jr	z,bootinc1	; Z - found a duplicate, exit out
+;
+bootadd1:
+	; check we have enough heap to allocate
+	ld	hl,(heaprem)	; remaing heap estimate
+	ld	de,(slicmem)	; memory alloc per drive
+	or	a		; clear carry
+	sbc	hl,de		; subtract slice from heap estimate
+	ret	c		; overflow (not enough heap) so abort
+	ld	(heaprem),hl	; update estimate based on sub of mem
+	; actually assign it.
+	ld	hl,(mapadr)	; address of next map entry in table
+	ld	a,(unit)	; the unit number
+	ld	(hl), a		; write unit number to Table
+	inc	hl
+	ld	a,(slice)	; the slice
+	ld	(hl), a		; write slice to the table
+	; show the new assignment
+	push	bc
+	push	de
+	ld	a,(dstdrv)	; destination drive
+	call	showone		; show it's new value
+	pop	de
+	pop	bc
+	; signal the change has occured
+	ld	hl,modcnt	; point to mod count
+	inc	(hl)		; increment it
+	; fall through to bootinc and inc target drive
+;
+; Increment to the next drive (A-P)
+; return C flag
+;   C have expended all drives
+;  NC still can continue to allocate
+bootinc:
+	; check we are not already past last (P:) drive
+	ld	hl,dstdrv	; destination drive
+	ld	a,15
+	cp	(hl)		; C set if >= 16
+	ret	c		; Return with carry, cannot increment.
+	; actually increment it
+	inc	(hl)		; increment destination drive (A-P)
+	ld	hl,(mapadr)	; address in working assignment table (mapwrk)
+	ld	bc,4
+	add	hl,bc
+	ld	(mapadr),hl	; move address to next location in map
+bootinc1:
+	ld	hl,dstdrv	; destination drive
+	ld	a,15
+	cp	(hl)		; C set if >= 16
+	ret
+;
+; Does Disk Unit Meet matching Criteria
+; pass in C which is the unit, ret Z if matching:
+;  * (atrmask) mask the device attribtes
+;  * (atrcomp) compare to set zero flag
+; registers BC DE HL are preserved
+bootmat:
+	push	hl
+	push	de
+	push	bc		; preserve
+	; get the disk unit attributes
+	ld	b,BF_DIODEVICE	; hbios func: diodevice C:= DISK UNIT
+	rst	08		; call hbios, C := device attributes
+	; do the attribute comparison
+	ld	a,(atrmask)	; attribute bit mask
+	and	c		; mask with device attributes from hbios
+	ld	c,a		; move value back to c
+	ld	a,(atrcomp)	; value parameter to compare with
+	cp	c		; do the comparison : Z if matching
+	jr	nz,bootmat3	; not matching, just return, NZ go no further
+	; Attributes match - did caller request high capacity device
+	bit	5,a		; high capacity flag passed in (atrcomp)
+	jr	NZ,bootmat1	; IF hig capacity, test if hd is onlne
+	; Attributes match - but NOT high capacity
+	xor	a		; Result = Z
+	jr	bootmat3	; and return
+bootmat1:
+	; Attributes match - and IS high capacity
+	pop	bc		; get C para back (unit)
+	push	bc
+	; Sense Media
+	ld	b,BF_DIOMEDIA	; HBIOS FUNC: SENSE MEDIA
+	ld	e,1		; PERFORM MEDIA DISCOVERY
+	rst	08		; DO IT
+	; returns NZ if error (no media), and Z if no error (media detected)
+	; can just return this flag
+bootmat3:
+	pop	bc
+	pop	de
+	pop	hl		; restore and return
+	ret
+;
+; ----------------------------------------------------------------
+;
 ; Install the new drive map into CBIOS
 ;
 install:
@@ -546,7 +1054,7 @@ install3:
 	ld	(heaptop),de	; DE has next byte available
 ;
 	; allocate directory buffer
-	ld	hl,128		; size of directory buffer
+	ld	hl,SIZ_DBUF	; size of directory buffer
 	call	alloc		; allocate the space
 	jp	c,instovf	; handle overflow error
 	ld	(dirbuf),hl	; ... and save in dirbuf
@@ -574,8 +1082,7 @@ dph_init2:
 	ld	a,(hl)		; unit to A
 	push	bc		; save loop control
 	push	hl		; save drive map pointer
-	;ld	hl,16		; size of a DPH structure
-	ld	hl,20		; size of a DPH structure
+	ld	hl,SIZ_DPH	; size of a DPH structure
 	call	alloc		; allocate space for dph
 	jp	c,instovf	; handle overflow error
 	push	hl		; save DPH location
@@ -607,9 +1114,15 @@ dph_init3:
 	call	prtdecw		; print it
 	ld	de,msgmem	; add description
 	call	prtstr		; and print it
+;
+#if 0
+	call	crlf
+	ld	bc,(heaprem)
+	call	prthexword
+#endif
 ;
 	call	drvrst		; perform BDOS drive reset
-;	
+;
 	xor	a		; signal success
 	ret			; done
 ;
@@ -653,25 +1166,25 @@ makdphuna1:	; handle ram/rom
 makdphwbw:	; determine appropriate dpb (WBW mode, unit number in A)
 ;
 	ld	c,a		; unit number to C
-	ld	b,$17		; HBIOS: Report Device Info
+	ld	b,BF_DIODEVICE	; HBIOS: Report Device Info
 	rst	08		; call HBIOS, return w/ device type in D, physical unit in E
 	ld	a,d		; device type to A
-	cp	$00		; ram/rom?
+	cp	DIODEV_MD	; ram/rom?
 	jr	nz,makdph00	; if not, skip ahead to other types
 	ld	a,e		; physical unit number to A
-	ld	e,1		; assume rom
+	ld	e,MID_MDROM	; assume rom
 	cp	$01		; rom?
 	jr	z,makdph0	; yes, jump ahead
-	ld	e,2		; otherwise ram
+	ld	e,MID_MDRAM	; otherwise ram
 	jr	makdph0		; jump ahead
-makdph00:	
-	ld	e,6		; assume floppy
-	cp	$01		; floppy?
+makdph00:
+	ld	e,MID_FD144	; assume floppy
+	cp	DIODEV_FD	; floppy?
 	jr	z,makdph0	; yes, jump ahead
-	ld	e,3		; assume ram floppy
-	cp	$02		; ram floppy?
+	ld	e,MID_RF	; assume ram floppy
+	cp	DIODEV_RF	; ram floppy?
 	jr	z,makdph0	; yes, jump ahead
-	ld	e,4		; everything else is assumed to be hard disk
+	ld	e,MID_HD	; everything else is assumed to be hard disk
 	jr	makdph0		; yes, jump ahead
 ;
 makdph0:
@@ -689,7 +1202,7 @@ makdph1:
 	pop	hl		; hl := start of dph
 	ld	a,8		; size of dph reserved area
 	call	addhl		; leave it alone (zero filled)
-;	
+;
 	ld	bc,(dirbuf)	; address of dirbuf
 	ld	(hl),c		; plug dirbuf
 	inc	hl		; ... into dph
@@ -716,7 +1229,7 @@ makdph2:
 ;
 	; HL := alloc size, DE bumped
 	ex	de,hl
-	ld	e,(hl)		; get size to allocate 
+	ld	e,(hl)		; get size to allocate
 	inc	hl		; ...
 	ld	d,(hl)		; ... into HL
 	inc	hl		; and bump DE
@@ -730,7 +1243,7 @@ makdph2:
 	; allocate memory
 	call	alloc		; do the allocation
 	jp	c,instovf	; bail out on overflow
-	
+
 makdph3:
 	; swap hl and bc
 	push	bc		; bc -> (sp)
@@ -741,7 +1254,7 @@ makdph3:
 	ld	(hl),c		; save cks/als buf
 	inc	hl		; ... address in
 	ld	(hl),b		; ... dph and bump
-	inc	hl		; ... to next dph entry	
+	inc	hl		; ... to next dph entry
 	xor	a		; signal success
 	ret
 ;
@@ -751,7 +1264,7 @@ instcpm3:
 	; swicth to sysbnk
 	ld	a,($FFE0)	; get current bank
 	push	af		; save it
-	ld	bc,$F8F2	; HBIOS Get Bank Info
+	ld	bc,BC_SYSGET_BNKINFO ; HBIOS Get Bank Info
 	rst	08		; call HBIOS, E=User Bank
 	ld	a,e		; HBIOS User Bank
 	call	$FFF3		; HBIOS BNKSEL
@@ -763,8 +1276,7 @@ instcpm3:
 	ld	h,(hl)		; ...
 	ld	l,a		; ...
 	ld	(dphadr),hl	; save starting dphadr
-	
-	
+
 	ld	hl,(drvtbl)	; get drive table in HL
 	ld	de,mapwrk	; DE := working drive map
 	ld	b,16
@@ -783,7 +1295,7 @@ instc1:
 	inc	de		; ...
 	jr	instc3		; resume loop without copy
 ;
-instc2:	
+instc2:
 	push	hl		; save drvtbl entry adr
 	push	de		; save mapwrk entry adr
 	ld	de,(dphadr)	; get cur dph adr
@@ -865,15 +1377,15 @@ alloc:
 	ex	de,hl		; de=new heaptop, hl=heaplim
 	sbc	hl,de		; heaplim - heaptop
 	jr	c,allocx	; c set on overflow error
-	; allocation succeeded, commit new heaptop              
+	; allocation succeeded, commit new heaptop
 	ld	(heaptop),de	; save new heaptop
-allocx:                         
+allocx:
 	pop	hl		; return value to hl
 	pop	de		; recover de
 	ret
 ;
 ; Scan drive map table for integrity
-; Currently just checks for multiple drive 
+; Currently just checks for multiple drive
 ;   letters referencing a single file system
 ;
 valid:
@@ -905,6 +1417,14 @@ valid2:		; setup for inner loop
 	call	addhl		; point to entry following
 	pop	de		; de points to comparison entry
 ;
+; Scan for a match in (mapwrk)
+; The following comparison code is called elsewhere, not just from above
+; (please respect the contract)
+; hl : pointer to start of items to scan check in map
+; de is the invarient (fixed) entry in the table to compare against
+; b : is the number of items to check
+; return  Z - Found a duplicate comparison=0
+; return NZ - No Matches found (a=$ff)
 valid3:		; inner loop
 	; bypass unassigned drives (only need to test 1)
 	ld	a,(hl)		; get first drive unit in A
@@ -981,7 +1501,7 @@ drvswap:
 	ld	a,(srcdrv)	; get the source drive
 	call	chkdrv		; valid drive?
 	ret	nz		; abort if not
-	ld	hl,(drives)	; load source/dest in DE
+	ld	hl,(drives)	; load source/dest in HL
 	ld	a,h		; put source drive num in a
 	cp	l		; compare to the dest drive num
 	jp	z,errswp	; Invalid swap request, src == dest
@@ -1001,7 +1521,7 @@ drvswap:
 	rlca
 	call	addhl
 	ld	(dstptr),hl
-;	
+;
 	; 1) dest -> temp
 	ld	hl,(dstptr)
 	ld	de,tmpent
@@ -1064,20 +1584,19 @@ drvmap1:	; loop through device table looking for a match
 	djnz	drvmap1		; and loop
 	jp	errdev
 ;
-drvmap2:	
+drvmap2:
 	; convert index to device type id
 	ld	a,c		; index to accum
 	ld	(device),a	; save as device id
 ;
 	; loop thru hbios units looking for device type/unit match
-	ld	b,$F8		; hbios func: sysget
-	ld	c,$10		; sysget subfunc: diocnt
-	rst	08		; call hbios, E := device count 
+	ld	bc,BC_SYSGET_DIOCNT ; hbios func: sysget subfunc: diocnt
+	rst	08		; call hbios, E := device count
 	ld	b,e		; use device count for loop count
 	ld	c,0		; use C for device index
 drvmap3:
 	push	bc		; preserve loop control
-	ld	b,$17		; hbios func: diodevice
+	ld	b,BF_DIODEVICE	; hbios func: diodevice
 	rst	08		; call hbios, D := device, E := unit
 	pop	bc		; restore loop control
 	ld	a,(device)
@@ -1099,7 +1618,7 @@ drvmap5:
 	call	chkdev		; check validity
 	pop	bc		; restore unit
 	ret	nz		; bail out on error
-	
+
 	; resolve the CBIOS DPH table entry
 	ld	a,(dstdrv)	; dest drv num to A
 	call	chkdrv		; valid drive?
@@ -1206,12 +1725,12 @@ showall:
 	ld	b,16		; 16 drives possible
 	ld	c,0		; map index (drive letter)
 ;
-	ld	a,b		; load count
-	or	$FF		; signal no action
-	ret	z		; bail out if zero
+;	ld	a,b		; load count
+;	or	$FF		; signal no action
+;	ret	z		; bail out if zero
 ;
 showall1:	; loop
-	ld	a,c		;
+;	ld	a,c		;
 	push	bc		; save loop control
 	call	showass
 	pop	bc		; restore loop control
@@ -1226,8 +1745,9 @@ showall1:	; loop
 showass:
 ;
 	; setup HL to point to desired entry in table
-	ld	c,a		; save incoming drive in C
+;	ld	c,a		; save incoming drive in C
 	ld	hl,mapwrk	; HL = address of drive map
+	ld	a,c
 	rlca
 	rlca
 	call	addhl		; HL = address of drive map table entry
@@ -1301,7 +1821,7 @@ prtdev:
 	or	a		; set flags
 	ld	a,e		; put device num back
 	jr	nz,prtdevu	; print device in UNA mode
-	ld	b,$17		; hbios func: diodevice
+	ld	b,BF_DIODEVICE	; hbios func: diodevice
 	ld	c,a		; unit to C
 	rst	08		; call hbios, D := device, E := unit
 	push	de		; save results
@@ -1326,7 +1846,7 @@ prtdevu:
 	push	bc
 	push	de
 	push	hl
-;	
+;
 	; UNA mode version of print device
 	ld	b,a		; B := unit num
 	push	bc		; save for later
@@ -1389,15 +1909,14 @@ chkdrv:
 ;
 chkdev:		; HBIOS variant
 	push	af		; save incoming unit
-	ld	b,$F8		; hbios func: sysget
-	ld	c,$10		; sysget subfunc: diocnt
+	ld	bc,BC_SYSGET_DIOCNT ; hbios func: sysget subfunc: diocnt
 	rst	08		; call hbios, E := device count
 	pop	af		; restore incoming unit
 	cp	e		; compare to unit count
 	jp	nc,errdev	; if too high, error
 ;
 	; get device/unit info
-	ld	b,$17		; hbios func: diodevice
+	ld	b,BF_DIODEVICE	; hbios func: diodevice
 	ld	c,a		; unit to C
 	rst	08		; call hbios, C := device attributes
 ;
@@ -1476,7 +1995,7 @@ prtstr1:
 ;
 prtstr2:
 	pop	de		; restore registers
-	ret	
+	ret
 ;
 ; Print the value in A in hex without destroying any registers
 ;
@@ -1499,7 +2018,7 @@ prthexword:
 	ld	a,b
 	call	prthex
 	ld	a,c
-	call	prthex 
+	call	prthex
 	pop	af
 	ret
 ;
@@ -1523,9 +2042,9 @@ hexascii:
 hexconv:
 	and	$0F	     	; low nibble only
 	add	a,$90
-	daa	
+	daa
 	adc	a,$40
-	daa	
+	daa
 	ret
 ;
 ; Print value of A or HL in decimal with leading zero suppression
@@ -1871,19 +2390,27 @@ drives:
 dstdrv	.db	0		; destination drive
 srcdrv	.db	0		; source drive
 device	.db	0		; source device
+; note (unit and slice) need to be kept ordered since they are used
+; in code forming a temp table entry (comparison purposes). See bootadd:
 unit	.db	0		; source unit
 slice	.db	0		; source slice
 ;
+atrmask	.db	0		; device attributes mask before compare
+atrcomp	.db	0		; device attributes compare to
+slicec	.db	1		; number of slices to assign for each volume
+slicmem	.dw	280		; memory to allocate to next slice assigment
+;
 unamod	.db	0		; $FF indicates UNA UBIOS active
 modcnt	.db	0		; count of drive map modifications
 ;
 srcptr	.dw	0		; source pointer for copy
 dstptr	.dw	0		; destination pointer for copy
 tmpent	.fill	4,0		; space to save a table entry
-tmpstr	.fill	9,0		; temporary string of up to 8 chars, zero term
+tmpstr	.fill	17,0		; temporary string of up to 16 chars, zero term
 ;
 heaptop	.dw	0		; current address of top of heap memory
 heaplim	.dw	0		; heap limit address
+heaprem	.dw	$7FFF		; estimate of heap remaining, (before allocate)
 ;
 dirbuf	.dw	0		; directory buffer location
 ;
@@ -1893,6 +2420,7 @@ scbop	.db	$FF		; set a byte
 scbval	.dw	$FF		; value to set
 ;
 mapwrk	.fill	(4 * 16),$FF	; working copy of drive map
+mapadr	.dw	mapwrk		; working pointer into mapwrk used by /B=
 ;
 devtbl:				; device table
 	.dw	dev00, dev01, dev02, dev03
@@ -1936,17 +2464,19 @@ stack	.equ	$		; stack top
 ; Messages
 ;
 indent	.db	"   ",0
-msgban1	.db	"ASSIGN v1.8 for RomWBW CP/M ",0
+msgban1	.db	"ASSIGN v2.0 for RomWBW CP/M ",0
 msg22	.db	"2.2",0
 msg3	.db	"3",0
-msbban2	.db	", 13-Oct-2023",0
+msbban2	.db	", 21-Dec-2024",0
 msghb	.db	" (HBIOS Mode)",0
 msgub	.db	" (UBIOS Mode)",0
-msgban3	.db	"Copyright 2023, Wayne Warthen, GNU GPL v3",0
+msgban3	.db	"Copyright 2024, Wayne Warthen, GNU GPL v3",0
 msguse	.db	"Usage: ASSIGN D:[=[{D:|<device>[<unitnum>]:[<slicenum>]}]][,...]",13,10
 	.db	"  ex. ASSIGN           (display all active assignments)",13,10
 	.db	"      ASSIGN /?        (display version and usage)",13,10
 	.db	"      ASSIGN /L        (display all possible devices)",13,10
+	.db	"      ASSIGN /B=OPTS   (perform assignment based on options)",13,10
+	.db	"      ASSIGN C:        (display assignment for C:)",13,10
 	.db	"      ASSIGN C:=D:     (swaps C: and D:)",13,10
 	.db	"      ASSIGN C:=FD0:   (assign C: to floppy unit 0)",13,10
 	.db	"      ASSIGN C:=IDE0:1 (assign C: to IDE unit0, slice 1)",13,10

Source/Apps/copysl/Build.cmd

@@ -0,0 +1,8 @@
+@echo off
+setlocal
+
+:: copysl.com is currently distributed as a binary application, so
+:: it is not built here.
+
+copy /Y copysl.com ..\..\..\Binary\Apps\ || exit /b
+copy /Y copysl.doc ..\..\..\Binary\Apps\ || exit /b

Source/Apps/copysl/Clean.cmd

@@ -0,0 +1,5 @@
+@echo off
+setlocal
+
+:: copysl.com is currently distributed as a binary application, so
+:: we do not delete the .COM file.

Source/Apps/copysl/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = copysl.com
+NODELETE = $(OBJECTS)
+DOCS = copysl.doc
+DEST = ../../../Binary/Apps
+DOCDEST = ../../../Binary/Apps
+TOOLS=../../../Tools
+include $(TOOLS)/Makefile.inc

Source/Apps/copysl/copysl.doc

@@ -0,0 +1,98 @@
+==========================================================================
+              CopySlice Utility v0.2 for RomWbW computers
+                   written by Mark Pruden (Sept 2024)
+==========================================================================
+
+Purpose:
+--------
+
+The purpose of this utility is to allow the copying of whole disk slices
+from one disk slice to another slice
+
+Background
+----------
+
+This tool is only supported by RomWBW HBIOS, it uses HDIOS for all its 
+disk IO. UNA UBIOS is not supported by this tool. 
+
+This tool is running on CP/M 2.2 or 3.0 and has access to full 64kb of
+RAM, with a minimum of 48kb TPA
+
+This tool only works with hard disk devices, other media types like 
+floppy, are not supported at this time. This tool works across different 
+hard disk device types, even of different physical type
+
+Both hd1k and hd512 are fully supported, however copying from one layout 
+type to the other is not supported.
+
+During operation data is copied in a single read/write pass, data is not 
+verified by default. If there is a write error, it will be reported, and
+operation will stop.
+
+General Usage
+-------------
+This tool operates at the disk level via RomWBW, thus all disk identifiers 
+are in the RomWBW <disk>.<unit> format
+
+The syntax (similar to copy) for the command is:
+
+  COPYSL <destunit>[.<slice>]=<srcunit>[.<slice>] [/options]
+  
+E.g.
+  
+  COPYSL 3.3=2.10 /U
+
+Means copy from slice 10 on disk 2, onto disk 3 slice 3. This is in 
+unattended mode, so you will not be asked to confirm the copy operation.
+
+Options
+-------
+F - Full disk copy. Copies the complete disk slice, all sectors.
+U - Unattended. Will complete copy without confirmation from the user.
+V - Verify. Does an additional read and verify after write.
+
+Description
+-----------
+
+When run COPYSL will perform command line argument validation and display 
+an error if they are illegal. Also any disk IO errors will cause COPYSL
+to exit.
+
+When specifying slice number(s) a check is made that the slice number is 
+valid, i.e. not too large that it would extend past the end of the 
+partition (hd1k), or the end of the media (hd512). For hd512 a check is
+also performed to ensure that the slice would not extend into the first 
+defined partition.
+
+The copy operation will be faster if the source disk has been formatted
+with the CP/M file system, since during copy the CP/M directory is scanned, 
+and unused blocks are not copied. 
+
+If a filesystem is not found, (or the /F option is chosen) all data is 
+copied.
+
+Verification (if option chosen) will do an aditional read (after write)
+and compare the data read matches what was written. This compare is only
+on every 32'nd byte. This is done for efficiency. 
+
+During copy dots "." will be displayed to indicate progress of the copy.
+Each "." represents 16 kBytes of data. Each line of "." 's is 1 mBytes.
+
+Testing
+-------
+This tool has been writen and tested on a SC126 computer. Testing been on both 
+SD and CF media types, and with both hd1k and hd512 formats
+
+History
+-------
+* v 0.1 Initial Release
+* v 0.2 Added the /v command option to read and verify after write
+
+Future
+------
+* support ability to read and write from image files stored in CP/M filesystem
+* maybe the verify options could allow more complete verification.
+  This would be at the cost of performance
+* ability to abort once the copy has started <ctrl><c>
+
+

Source/Apps/cpuspd/Build.cmd

@@ -5,6 +5,6 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF cpuspd.asm cpuspd.com cpuspd.lst || exit /b
+tasm -t80 -g3 -fFF cpuspd.asm cpuspd.com cpuspd.lst || exit /b
 
 copy /Y cpuspd.com ..\..\..\Binary\Apps\ || exit /b

Source/Apps/cpuspd/cpuspd.asm

@@ -23,6 +23,12 @@ rtc_port	.equ	$70		; RTC latch port adr
 restart		.equ	$0000		; CP/M restart vector
 bdos		.equ	$0005		; BDOS invocation vector
 ;
+bf_sysreset	.equ	$F0		; restart system
+;
+bf_sysres_int	.equ	$00		; reset hbios internal
+bf_sysres_warm	.equ	$01		; warm start (restart boot loader)
+bf_sysres_cold	.equ	$02		; cold start
+;
 ident		.equ	$FFFE		; loc of RomWBW HBIOS ident ptr
 ;
 ;=======================================================================
@@ -113,6 +119,10 @@ main1:
 ;
 main2:
 	ret	z		; if end, nothing to do
+	cp	'W'		; warm boot?
+	jp	z,wboot		; if so, do it
+	cp	'C'		; cold boot?
+	jp	z,cboot		; if so, do it
 	cp	','		; no new speed?
 	jr	z,main2a	; go to wait states
 	; parse speed string (half, full, double)
@@ -161,6 +171,9 @@ parse_spd:
 	ld	c,2			; assume double speed
 	cp	'D'			; check it
 	jr	z,parse_spd1		; if equal, done
+	ld	c,3			; assume quad speed
+	cp	'Q'			; check it
+	jr	z,parse_spd1		; if equal, done
 	or	a			; clear CF
 	ccf				; set CF to indicate error
 	ret
@@ -222,6 +235,9 @@ show_spd:
 	ld	de,str_dbl
 	cp	2
 	jr	z,show_spd1
+	ld	de,str_quad
+	cp	3
+	jr	z,show_spd1
 	jp	err_invalid
 show_spd1:
 	call	prtstr
@@ -267,6 +283,24 @@ usage:
 	or	$FF
 	ret
 ;
+; Handle Warm Boot
+;
+wboot:
+	ld	de,str_warmboot		; message
+	call	prtstr			; display it
+	ld	b,bf_sysreset		; system restart
+	ld	c,bf_sysres_warm	; warm start
+	call	$fff0			; call hbios
+;
+; Handle Cold Boot
+;
+cboot:
+	ld	de,str_coldboot		; message
+	call	prtstr			; display it
+	ld	b,bf_sysreset		; system restart
+	ld	c,bf_sysres_cold	; cold start
+	call	$fff0			; call hbios
+;
 ; Error Handlers
 ;
 err_una:
@@ -510,9 +544,6 @@ prtd3m2:
 	call	prtchr
 prtd3m3:
 	ret
-
-
-
 ;
 ; Get the next non-blank character from (HL).
 ;
@@ -665,7 +696,7 @@ delay1:
 ; Constants
 ;=======================================================================
 ;
-str_banner		.db	"RomWBW CPU Speed Selector v0.6, 29-Dec-2023",0
+str_banner		.db	"RomWBW CPU Speed Selector v1.0, 11-Sep-2024",0
 str_spacer		.db	"  ",0
 str_oscspd		.db	" MHz Oscillator",0
 str_cpuspd		.db	"  CPU speed is ",0
@@ -674,8 +705,11 @@ str_mhz			.db	" MHz",0
 str_slow		.db	" (Half)",0
 str_full		.db	" (Full)",0
 str_dbl			.db	" (Double)",0
+str_quad		.db	" (Quad)",0
 str_memws		.db	" Memory Wait State(s)",0
 str_iows		.db	" I/O Wait State(s)",0
+str_warmboot		.db	"\r\n\r\nWarm booting...",0
+str_coldboot		.db	"\r\n\r\nCold booting...",0
 str_err_una		.db	"  ERROR: UNA not supported by application",0
 str_err_inv		.db	"  ERROR: Invalid BIOS (signature missing)",0
 str_err_ver		.db	"  ERROR: Unexpected HBIOS version",0
@@ -684,8 +718,10 @@ str_err_not_sup		.db	"  ERROR: Platform or configuration does not support CPU sp
 str_err_invalid		.db	"  ERROR: Invalid configuration!",0
 str_err_api		.db	"  ERROR: HBIOS API error!",0
 str_usage		.db	"  Usage: CPUSPD <cpuspd>,<memws>,<iows>\r\n"
+			.db	"         CPUSPD (W)armBoot\r\n"
+			.db	"         CPUSPD (C)oldBoot\r\n"
 			.db	"\r\n"
-			.db	"         <cpuspd>: \"Half\", \"Full\", or \"Double\"\r\n"
+			.db	"         <cpuspd>: (H)alf | (F)ull | (D)ouble | (Q)uad\r\n"
 			.db	"         <memws>:  Memory wait states\r\n"
 			.db	"         <iows>:   I/O wait states\r\n"
 			.db	"\r\n"

Source/Apps/format/Build.cmd

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

Source/Apps/format/Clean.cmd

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

Source/Apps/format/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = format.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/format/format.asm

@@ -19,7 +19,7 @@
 ;  1) Actually implement this
 ;_______________________________________________________________________________
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
 ;
 ;===============================================================================
 ; Definitions

Source/Apps/mode/Build.cmd

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

Source/Apps/mode/Clean.cmd

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

Source/Apps/mode/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = mode.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/mode/mode.asm

@@ -37,7 +37,7 @@
 ;  1) Implement flow control settings
 ;_______________________________________________________________________________
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
 ;
 ;===============================================================================
 ; Definitions

Source/Apps/reboot/Build.cmd

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

Source/Apps/reboot/Clean.cmd

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

Source/Apps/reboot/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = reboot.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/reboot/reboot.asm

@@ -0,0 +1,299 @@
+;==============================================================================
+; REBOOT - Allows the user to Cold or Warm Boot the RomWBW System
+; Version 1.0 12-October-2024
+;==============================================================================
+;
+; Author: MartinR (October 2024)
+;    Based **very heavily** on code by Wayne Warthen (wwarthen@gmail.com)
+;______________________________________________________________________________
+;
+; Usage:
+;   REBOOT [/C] [/W] [/?]
+;     ex: REBOOT	Display version and usage
+;         REBOOT /?	Display version and usage
+;         REBOOT /C	Cold boot RomWBW system
+;	  REBOOT /W	Warm boot RomWBW system
+;
+; Operation:
+;   Cold or warm boots a RomWBW system depending on the user option selected.
+;
+; This code will only execute on a Z80 CPU (or derivitive)
+;
+; This source code assembles with TASM V3.2 under Windows-11 using the
+; following command line:
+;	tasm -80 -g3 -l REBOOT.ASM REBOOT.COM
+;	ie: Z80 CPU; output format 'binary' named .COM (rather than .OBJ)
+;	and includes a symbol table as part of the listing file.
+;______________________________________________________________________________
+;
+; Change Log:
+;   2024-09-11 [WBW] Release of RomWBW CPU Speed Selector v1.0 used as the basis
+;   2024-10-12 [MR ] Initial release of version 1.0
+;______________________________________________________________________________
+;
+; Include Files
+;
+#include "../../ver.inc"		; Used for building RomWBW
+#include "../../HBIOS/hbios.inc"
+
+;#include "ver.inc"			; Used for testing purposes....
+;#include "hbios.inc"			; ....during code development
+;
+;===============================================================================
+;
+; General operational equates (should not requre adjustment)
+;
+stksiz		.equ	$40		; Working stack size
+;
+restart		.equ	$0000		; CP/M restart vector
+bdos		.equ	$0005		; BDOS invocation vector
+;
+bf_sysreset	.equ	$F0		; restart system
+bf_sysres_int	.equ	$00		; reset hbios internal
+bf_sysres_warm	.equ	$01		; warm start (restart boot loader)
+bf_sysres_cold	.equ	$02		; cold start
+;
+ident		.equ	$FFFE		; loc of RomWBW HBIOS ident ptr
+;
+;===============================================================================
+;
+	.org	$0100			; standard CP/M TPA executable
+;
+	; setup stack (save old value)
+	ld	(stksav),sp		; save stack
+	ld	sp,stack		; set new stack
+;
+	call	crlf
+	ld	de,str_banner		; banner
+	call	prtstr
+;
+	; initialization
+	call	init			; initialize
+	jr	nz,exit			; abort if init fails
+;
+	call	main			; do the real work
+;
+exit:
+	; clean up and return to command processor
+	call	crlf			; formatting
+	ld	sp,(stksav)		; restore stack
+	jp	restart			; return to CP/M via restart
+;
+;
+;===============================================================================
+; Main Program
+;===============================================================================
+;
+; Initialization
+;
+init:
+	; check for UNA (UBIOS)
+	ld	a,($FFFD)	; fixed location of UNA API vector
+	cp	$C3		; jp instruction?
+	jr	nz,initwbw	; if not, not UNA
+	ld	hl,($FFFE)	; get jp address
+	ld	a,(hl)		; get byte at target address
+	cp	$FD		; first byte of UNA push ix instruction
+	jr	nz,initwbw	; if not, not UNA
+	inc	hl		; point to next byte
+	ld	a,(hl)		; get next byte
+	cp	$E5		; second byte of UNA push ix instruction
+	jr	nz,initwbw	; if not, not UNA
+	jp	err_una		; UNA not supported
+;
+initwbw:
+	; get location of config data and verify integrity
+	ld	hl,(ident)	; HL := adr or RomWBW HBIOS ident
+	ld	a,(hl)		; get first byte of RomWBW marker
+	cp	'W'		; match?
+	jp	nz,err_inv	; abort with invalid config block
+	inc	hl		; next byte (marker byte 2)
+	ld	a,(hl)		; load it
+	cp	~'W'		; match?
+	jp	nz,err_inv	; abort with invalid config block
+	inc	hl		; next byte (major/minor version)
+	ld	a,(hl)		; load it
+	cp	rmj << 4 | rmn	; match?
+	jp	nz,err_ver	; abort with invalid os version
+;
+initz:
+	; initialization complete
+	xor	a		; signal success
+	ret			; return
+;
+;
+;
+main:
+	; skip to start of first command line parameter
+	ld	ix,$0081	; point to start of parm area (past length byte)
+	call	nonblank	; skip to next non-blank char
+	cp	'/'		; option prefix?
+	jr	nz,usage	; display help info & exit if nothing to do
+;
+	; process any options
+	inc	ix		; fetch next character and process
+	ld	a,(ix)
+	call	upcase		; ensure it's an upper case character
+	cp	'C'		; if it's a 'C' then
+	jr	z,cboot		; do a cold boot.
+	cp	'W'		; if it's a 'W' then
+	jr	z,wboot		; do a warm boot.
+	cp	'?'		; if it's a '?' then
+	jr	z,usage		; display usage info and exit.
+	jr	err_parm	; or not a recognised option, so report and exit.
+;
+; Handle Usage Information
+;
+usage:
+	call	crlf2		; display the options for this utility
+	ld	de,str_usage
+	call	prtstr
+	or	$FF
+	ret			; exit back out to CP/M CCP
+;
+; Handle Warm Boot
+;
+wboot:
+	ld	de,str_warmboot		; message
+	call	prtstr			; display it
+	ld	b,bf_sysreset		; system restart
+	ld	c,bf_sysres_warm	; warm start
+	call	$fff0			; call hbios
+;
+; Handle Cold Boot
+;
+cboot:
+	ld	de,str_coldboot		; message
+	call	prtstr			; display it
+	ld	b,bf_sysreset		; system restart
+	ld	c,bf_sysres_cold	; cold start
+	call	$fff0			; call hbios
+;
+;===============================================================================
+; Error Handlers
+;===============================================================================
+;
+err_una:
+	ld	de,str_err_una
+	jr	err_ret
+err_inv:
+	ld	de,str_err_inv
+	jr	err_ret
+err_ver:
+	ld	de,str_err_ver
+	jr	err_ret
+err_parm:
+	ld	de,str_err_parm
+	jr	err_ret
+
+;
+err_ret:
+	call	crlf2
+	call	prtstr
+	or	$FF			; signal error
+	ret
+;
+;===============================================================================
+; Utility Routines
+;===============================================================================
+;
+; Print character in A without destroying any registers
+;
+prtchr:
+	push	af
+	push	bc		; save registers
+	push	de
+	push	hl
+	ld	e,a		; character to print in E
+	ld	c,$02		; BDOS function to output a character
+	call	bdos		; do it
+	pop	hl		; restore registers
+	pop	de
+	pop	bc
+	pop	af
+	ret
+;
+; Start a new line
+;
+crlf2:
+	call	crlf		; two of them
+crlf:
+	push	af		; preserve AF
+	ld	a,13		; <CR>
+	call	prtchr		; print it
+	ld	a,10		; <LF>
+	call	prtchr		; print it
+	pop	af		; restore AF
+	ret
+;
+; Print a zero terminated string at (de) without destroying any registers
+;
+prtstr:
+	push	af
+	push	de
+;
+prtstr1:
+	ld	a,(de)		; get next char
+	or	a
+	jr	z,prtstr2
+	call	prtchr
+	inc	de
+	jr	prtstr1
+;
+prtstr2:
+	pop	de		; restore registers
+	pop	af
+	ret
+;
+; Get the next non-blank character from (ix)
+;
+nonblank:
+	ld	a,(ix)		; load next character
+	or	a		; string ends with a null
+	ret	z		; if null, return pointing to null
+	cp	' '		; check for blank
+	ret	nz		; return if not blank
+	inc	ix		; if blank, increment character pointer
+	jr	nonblank	; and loop
+;
+; Convert character in A to uppercase
+;
+upcase:
+	cp	'a'		; if below 'a'
+	ret	c		; ... do nothing and return
+	cp	'z' + 1		; if above 'z'
+	ret	nc		; ... do nothing and return
+	res	5,a		; clear bit 5 to make lower case -> upper case
+	ret			; and return
+;
+;===============================================================================
+; Constants
+;===============================================================================
+;
+str_banner	.db	"RomWBW Reboot Utility, Version 1.0, 12-Oct-2024\r\n"
+		.db	"   Wayne Warthen (wwarthen@gmail.com) & MartinR",0
+;
+str_warmboot	.db	"\r\n\r\nWarm booting...\r\n",0
+str_coldboot	.db	"\r\n\r\nCold booting...\r\n",0
+;
+str_err_una	.db	"  ERROR: UNA not supported by application",0
+str_err_inv	.db	"  ERROR: Invalid BIOS (signature missing)",0
+str_err_ver	.db	"  ERROR: Unexpected HBIOS version",0
+str_err_parm	.db	"  ERROR: Parameter error (REBOOT /? for usage)",0
+;
+str_usage	.db	"  Usage: REBOOT /? - Display this help info.\r\n"
+		.db	"         REBOOT /W - Warm boot system\r\n"
+		.db	"         REBOOT /C - Cold boot system\r\n"
+		.db	"         Options are case insensitive.\r\n",0
+;
+;===============================================================================
+; Working data
+;===============================================================================
+;
+stksav		.dw	0		; stack pointer saved at start
+		.fill	stksiz,0	; stack
+stack		.equ	$		; stack top
+;
+;===============================================================================
+;
+	.end