Issue #366

Based on input from Dean Jenkins:
- Updated User Guide to clarify some nuances related to use of Combo Disk Images
- Added "blank" slice images

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+<!--
+BEFORE YOU CREATE A PULL REQUEST:
+
+- Please base all pull requests against the dev branch
+- Include a clear description of your change
+- Reference related Issue(s) (e.g., "Resolves Issue #123")
+
+Thank you for contributing to RomWBW!  I will review your pull request as soon as possible.
+
+DELETE EVERYTHING IN THIS COMMENT BLOCK AND REPLACE WITH YOUR COMMENTS
+-->

.github/workflows/commit.yml

@@ -3,10 +3,9 @@ name: Commit Build
 on:
   push:
     branches: 
-      - master
-      - dev
+      - '**'
     tags-ignore:
-      - v*
+      - '**'
 
 jobs:
   buildLinux:
@@ -14,17 +13,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: rlespinasse/github-slug-action@v3.x
-        
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+
+      - name: Get Commit Ref
+        run: |
+          COMMIT_REF=$(git rev-parse --short $GITHUB_SHA)
+          echo "COMMIT_REF: $COMMIT_REF"
+          echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV
 
       - name: Build
         run: |
           export TZ='America/Los_Angeles'
-          sudo apt-get install libncurses-dev
           sudo apt-get install srecord
           make dist
-          make clean
           rm -rf .git*
 
       - name: List Output
@@ -34,37 +36,29 @@ jobs:
           find -type f -exec md5sum '{}' \;
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.1
         with:
-          name: RomWBW_Linux-${{env.GITHUB_REF_SLUG}}-${{env.GITHUB_SHA_SHORT}}
+          name: RomWBW-${{env.COMMIT_REF}}-Linux
           path: .
 
-      - name: Create Package Archive
-        run: |
-            zip -r RomWBW-SnapShot-Package.zip .
- 
-      - name: Post SnapShot
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "SnapShot"
-          prerelease: true
-          title: "RomWBW Development SnapShot Build"
-          files: |
-            RomWBW-SnapShot-Package.zip
-
   buildMacOS:
-    runs-on: macos-latest
+    runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+
+      - name: Get Commit Ref
+        run: |
+          COMMIT_REF=$(git rev-parse --short $GITHUB_SHA)
+          echo "COMMIT_REF: $COMMIT_REF"
+          echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV
 
       - name: Build
         run: |
           export TZ='America/Los_Angeles'
           brew install srecord
           make dist
-          make clean
           rm -rf .git*
 
       - name: List Output
@@ -74,7 +68,7 @@ jobs:
           find . -type f -exec md5 -r -- '{}' +;
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.1
         with:
-          name: RomWBW_MacOS
+          name: RomWBW-${{env.COMMIT_REF}}-MacOS
           path: .

.github/workflows/release.yml

@@ -1,8 +1,9 @@
 name: Release Build
 
 on:
-  release:
-    types: published
+  push:
+    tags:
+      - '**'
 
 jobs:
   build:
@@ -10,42 +11,99 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      
-      - name: Create Package Label
-        run: |
-          LABEL=`echo "$GITHUB_REF" | sed "s|^refs/tags/||"`
-          echo "::set-env name=PKGLBL::$LABEL"
-         
-      - name: Display Diagnostics
-        run: |
-          echo PKGLBL: "$PKGLBL"
-          echo Upload URL: "${{github.event.release.upload_url}}"
-          echo GITHUB_TOKEN: "${{secrets.GITHUB_TOKEN}}"
-          
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+
       - name: Build
         run: |
+          export TZ='America/Los_Angeles'
           sudo apt-get install libncurses-dev
+          sudo apt-get install srecord
           make dist
-          make clean
           rm -rf .git*
       
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: RomWBW-${{env.PKGLBL}}-Package
-          path: .
-      
       - name: Create Package Archive
         run: |
-            zip -r Package.zip .
-          
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          zip -r RomWBW-${{github.ref_name}}-Package.zip .
+
+      - name: Set Title
+        run: |
+          echo "Tag: ${{github.ref_name}}"
+          if grep -q "dev" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Development Snapshot"
+          elif grep -q "pre" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Prerelease"
+          elif grep -q "rc" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Release Candidate"
+          else
+            TITLE="RomWBW"
+          fi
+          echo "Title: $TITLE"
+          echo "TITLE=$TITLE" >>$GITHUB_ENV
+
+      - name: Attach Package Archive
+        uses: wwarthen/actions/packages/automatic-releases@built-packages
         with:
-          upload_url: ${{github.event.release.upload_url}}
-          asset_path: Package.zip
-          asset_name: RomWBW-${{env.PKGLBL}}-Package.zip
-          asset_content_type: application/zip
+          repo_token: "${{secrets.GITHUB_TOKEN}}"
+          draft: true
+          prerelease: true
+          title: "${{env.TITLE}} ${{github.ref_name}}"
+          files: |
+            RomWBW-${{github.ref_name}}-Package.zip
+      
+#      - name: Upload Package Archive
+#        uses: AButler/upload-release-assets@v2.0.2
+#        with:
+#          repo-token: ${{secrets.github_token}}
+#          files: |
+#            RomWBW-${{env.PKGLBL}}-Package.zip
+
+
+#      - name: Post SnapShot
+#        uses: docker://antonyurchenko/git-release:latest
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          RELEASE_NAME_PREFIX: "${{env.TITLE}} "
+#          CHANGELOG_FILE: "none"
+#        with:
+#          args: |
+#            RomWBW-SnapShot-Package.zip
+            
+#      - name: Post SnapShot
+#        uses: cb80/pubrel@latest
+#        with:
+#          replace: true
+#          files: |
+#            RomWBW-SnapShot-Package.zip
+
+#      - name: Post SnapShot
+#        uses: wwarthen/actions/packages/automatic-releases@built-packages
+#        with:
+#          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+#          prerelease: true
+#          title: "RomWBW Development SnapShot ${{env.GITHUB_REF_SLUG}}"
+#          files: |
+#            RomWBW-SnapShot-Package.zip
+
+#      - name: Remove Older Releases
+#        uses: wwarthen/delete-release-action@v1.2
+#        with:
+#          release-drop: true
+#          release-keep-count: 0
+#          release-drop-tag: true
+#          pre-release-drop: false
+#          pre-release-keep-count: 0
+#          pre-release-drop-tag: true
+#          draft-drop: true
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+#      - name: Remove Older Releases
+#        uses: s00d/delete-older-releases@0.2.1
+#        with:
+#          keep_latest: 1
+##          delete_tag_pattern: beta # defaults to ""
+#          delete_type: 'release'
+#          delete_branch: 'main'
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -20,6 +20,7 @@
 
 Binary/**/*.mym
 Binary/**/*.pt3
+!Binary/cpnos-wbw.sys
 
 Source/**/eeprom
 Source/Apps/Assign.com
@@ -94,9 +95,9 @@ Tools/unix/zx/zx
 !Source/ZPM3/*.[Cc][Oo][Mm]
 !Source/ZSDOS/*.[Cc][Oo][Mm]
 !Source/ZRC/*.bin
-!Source/ZZR/*.bin
-!Source/ZZR/*.hex
-!Tools/cpm/bin/*
+!Source/ZZRC/*.bin
+!Source/ZZRC/*.hex
+!Tools/cpm/**
 !Tools/unix/zx/*
 !Tools/zx/*
 

Binary/Apps/Makefile

@@ -7,5 +7,5 @@ include $(TOOLS)/Makefile.inc
 all::
 	mkdir -p Tunes
 
-clobber::
+clean::
 	@rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.ovr *.hlp *.doc *.COM *.BIN Tunes/*.mym Tunes/*.pt? Tunes/*.vgm

Binary/Apps/Test/Makefile

@@ -3,5 +3,5 @@ MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com)
 
 include $(TOOLS)/Makefile.inc
 
-clobber::
+clean::
 	@rm -f *.com

Binary/Apps/Tunes/ReadMe.txt

@@ -7,4 +7,4 @@
 ***********************************************************************
 
 This directory contains some sample ProTracker and MYM sound
-files that can be played by the TUNE application.
+files that can be played by the TUNE or VGMPLAY application.

Binary/CPM3/Makefile

@@ -3,5 +3,5 @@ MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr)
 
 include $(TOOLS)/Makefile.inc
 
-clobber::
-	@rm -f *.spr
+clean::
+	@rm -f *.spr *.com *.sys *.dat cpm3fix.pat readme.1st

Binary/DiskList.txt

@@ -1,173 +0,0 @@
-***********************************************************************
-***                                                                 ***
-***                          R o m W B W                            ***
-***                                                                 ***
-***                    Z80/Z180 System Software                     ***
-***                                                                 ***
-***********************************************************************
-
-This directory ("Binary") is part of the RomWBW System Software 
-distribution archive.  Refer to the ReadMe.txt file in this 
-directory for more information on the overall contents of the 
-directory.
-
-RomWBW includes a set of disk images that are ready to copy onto
-a floppy or hard/CF/SD disk.  You can use your modern computer
-(Windows/Linux/Mac) to copy the disk image file onto your disk
-media.  The disk media will then be ready to use in your RomWBW
-System.
-
-WARNING: The hdnew_*.img disk images are part of a new disk
-format that is a work in progress.  Do not use these disk
-images without knowing exactly what you are doing!  The
-hd_*.img disk images continue to be the images you should
-be using under normal circumstances.
-
-A description of the disk images is provided later in this file.
-For more information on the creatioin of these images including
-instructions for customizing them or creating your own, refer to
-the ReadMe.txt file in the Source\Images directory.
-
-Installing Images
------------------
-
-The following instructions apply to Windows computers.  Alternatively,
-you can use the "dd" command on Linux or Mac.
-
-First of all, a MAJOR WARNING!!!!  The tools described below are 
-quite capable of obliterating your running Windows system drive.  Use 
-with extreme caution and make sure you have backups.
-
-To install a floppy image on floppy media, you can use the tool 
-called RaWriteWin.  This tool is included in the Tools directory of 
-the distribution. This tool will write your floppy image (fd_xxx.img) 
-to a floppy disk using a raw block transfer.  The tool is GUI based 
-and it's operation is self explanatory.
-
-To install a hard disk image on a CF card or SD card, you must have 
-the appropriate media card slot on your computer. If you do, you can 
-use the tool called Win32DiskImager. This tool is also included in 
-the Tools directory of the distribution.  It will write your 
-hard disk image (hd_xxx.img) to the designated media card.  This tool 
-is also GUI based and self explanatory.
-
-The use of the SIMH emulator is outside of the scope of this document.  
-However, if you use SIMH, you will find that you can attach the hard 
-disk images to the emulator with lines such as the following in your 
-SIMH configuration file:
-
-  | attach hdsk0 hd_cpm22.img
-  | set hdsk0 format=HDSK
-  | set hdsk0 geom=T:2048/N:256/S:512
-  | set hdsk0 wrtenb
-  
-Making Disk Images Bootable
----------------------------
-
-The Operating System disk images below are ready to boot by the
-RomWBW Boot Loader.  However, if you update your RomWBW ROM, then
-you should also update the system tracks of your bootable disk
-images.  You would use SYSCOPY to do this.  SYSCOPY can also be
-used to make a disk bootable if it is not already bootable.
-
-You would use a command like the following to make drive C bootable:
-
-  | B>SYSCOPY C:=CPM.SYS
-
-The system file to use depends on the operating system you are trying
-to boot from the slice you are initializing with SYSCOPY:
-
-  CP/M 2.2 - cpm.sys
-  ZSDOS 1.1 - zsys.sys
-  CP/M 3 - cpmldr.sys
-  ZPM3 - cpmldr.sys
-  
-Slices
-------
-
-A RomWBW CP/M filesystem is fixed at 8MB.  This is because it is the 
-largest size filesystem supported by all common CP/M variants. Since 
-all modern hard disks (including SD Cards and CF Cards) are much 
-larger than 8MB, RomWBW supports the concept of "slices".  This 
-simply means that you can concatenate multiple CP/M filesystems (up 
-to 256 of them) on a single physical hard disk and RomWBW will allow 
-you to assign drive letters to them and treat them as multiple 
-independent CP/M drives.
-
-With the exception of the hd_combo image, each of the disk images
-includes a single CP/M file system (i.e., a single slice).  However,
-you can easily create a multi-slice disk image by merely concatenating 
-multiple images together.  For example, if you wanted to create a 2 
-slice disk image that has ZSDOS in the first slice and Wordstar in 
-the second slice, you could use the following command from a Windows 
-command prompt:
-
-  | C:\RomWBW\Binary>copy /b hd_zsdos.img + hd_ws.img hd_multi.img
-
-You can now write hd_multi.img onto your SD or CF Card and you will 
-have ZSDOS in the first slice and Wordstar in the second slice.
-
-The hd_combo disk image is an example of this.  It contains several
-slices in one image file.  The contents of this special disk image
-are described below.
-
-The concept of slices applies ONLY to hard disks.  Floppy disks are 
-not large enough to support multiple slices.
-
-Disk Image Contents
--------------------
-
-What follows is a brief description of the contents of the
-disk images automatically provided in the RomWBW distribution.
-Note that all of the OS images include the RomWBW custom
-support apps.
-
-cpm22 - DRI CP/M 2.2 (Bootable Floppy and Hard Disk)
-
-  Standard DRI CP/M 2.2 distribution files along with a few commonly
-  used utilities.
-
-zsdos - ZCPR1 + ZSDOS 1.1 (Bootable Floppy and Hard Disk)
-
-  Contains ZCPR1 and ZSDOS 1.1.  This is roughly equivalent to the
-  ROM boot contents, but provides a full set of the applications
-  and related files that would not all fit on the ROM drive.
-
-nzcom - NZCOM (Bootable Floppy and Hard Disk)
-
-  Standard NZCOM distribution.  Note that you will need to run the
-  NZCOM setup before this will run properly.  You will need
-  to refer to the NZCOM documentation.  
-
-cpm3 - DRI CP/M3 (Bootable Floppy and Hard Disk)
-
-  Standard DRI CP/M 3 adaptation for RomWBW that is ready to run.
-  It can be started by running CPMLDR.
-
-zpm3 - ZPM3 (Bootable Floppy and Hard Disk)
-
-  Simeon Cran's ZCPR 3 compatible OS for CP/M 3 adapted for RomWBW and 
-  ready to run.  It can be started by running CPMLDR (which seems 
-  wrong, but ZPMLDR is somewhat broken).
-
-ws4 - WordStar 4 (Floppy and Hard Disk)
-
-  Micropro Wordstar 4 full distribution.  This image is not bootable
-  and is intended to be added as an additional slice to an OS image.
-
-bp - BPBIOS (Hard Disk only)
-
-  Adaptation of BPBIOS for RomWBW.  This is NOT complete and NOT
-  useable in it's current state.
-
-combo - Multi-Boot Combination (Bootable Hard Disk)
-
-  A pre-created combo image that contains the following slices.  The
-  slices are identical to the individual images listed above.
-
-    Slice 0: cpm22 (bootable)
-    Slice 1: zsdos (bootable)
-    Slice 2: nzcom (bootable)
-    Slice 3: cpm3 (bootable)
-    Slice 4: zpm3 (bootable)
-    Slice 5: ws4 (not bootable)

Binary/Makefile

@@ -4,5 +4,5 @@ SUBDIRS = Apps CPM3 ZPM3
 
 include $(TOOLS)/Makefile.inc
 
-clobber::
-	@rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat
+clean::
+	@rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat

Binary/ReadMe.txt

@@ -39,8 +39,8 @@ 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 the 
-RomList.txt file in this directory.
+Documentation of the pre-built ROM Images is contained in
+"RomWBW User Guide.pdf" in the Doc directory.
 
 ROM Firmware Update Images (<plt>_<cfg>.upd)
 -------------------------------------
@@ -49,7 +49,7 @@ The files with a ".upd" extension are binary images identical to the
 .rom files, but they only have the first 128K bytes.  The first 128K
 is the system image without the ROM disk contents.  These files can be
 used to update the system image without modifying the ROM disk
-contents.  Refer to the Getting Started document for more information.
+contents.  Refer to the RomWBW User Guide for more information.
 
 ROM Executable Images (<plt>_<cfg>.com)
 ---------------------------------------
@@ -75,8 +75,8 @@ 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)
-------------------------------
+Disk Images (fd_*.img, hd_*.img, psys.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, 
@@ -96,16 +96,18 @@ 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 hd_*.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.
+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.
 
-WARNING: The hdnew_*.img disk images are part of a new disk
-format that is a work in progress.  Do not use these disk
-images without knowing exactly what you are doing!  The
-hd_*.img disk images continue to be the images you should
-be using under normal circumstances.
+NOTE: The hd512_*.img files are equivalent to the hd_*.img
+files in previous distributions.  The hd1k_*.img files
+contained a revised file system format that increases the
+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 
 DiskList.txt file in this directory.
@@ -115,6 +117,12 @@ 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 
+p-System implementation.
+
 Propeller ROM Images (*.eeprom)
 -------------------------------
 

Binary/RomList.txt

@@ -1,260 +0,0 @@
-***********************************************************************
-***                                                                 ***
-***                          R o m W B W                            ***
-***                                                                 ***
-***                    Z80/Z180 System Software                     ***
-***                                                                 ***
-***********************************************************************
-
-This directory ("Binary") is part of the RomWBW System Software
-distribution archive.  Refer to the ReadMe.txt file in this
-directory for more information on the overall contents of the
-directory.
-
-When distributed, RomWBW contains a set of pre-built ROM images that
-are ready to program onto the EEPROM of any of the Z80/Z180 based
-RetroBrew Computers CPU boards.  Additionally, any custom built ROM
-images will be placed in this directory.
-
-All of the pre-built ROM images are 512KB.  This size is compatible
-with all of the Z80/Z180 systems.  Some systems can accept different
-size ROM images.  Creating alternative sizes requires a custom ROM
-build (see ReadMe.txt in the Source directory).
-
-It is critical that the right ROM Imgae be selected for the target
-platform being used.  The table below indicates the correct ROM
-image to use for each platform:
-
-	SBC V1/V2	SBC_std.rom
-	SBC SimH	SBC_simh.rom
-	Zeta V1		ZETA_std.rom
-	Zeta V2		ZETA2_std.rom
-	N8		N8_std.rom
-	Mark IV		MK4_std.rom
-	RC2014 w/ Z80	RCZ80_std.rom
-	RC2014 w/ Z180	RCZ180_nat.rom	(native Z180 memory addressing)
-	RC2014 w/ Z180	RCZ180_ext.rom	(external 512K RAM/ROM module)
-	SC-series	SC126, SC130, SC131
-	Easy Z80	EZZ180_std.rom
-	Dyno		DYNO_std.rom
-
-You will find there is one additional ROM image called
-"UNA_std.rom". This ROM image is an UNA-based RomWBW ROM image.  As
-such, this ROM image can be used on any Z80/Z180 platform supported
-by John Coffman's UNA BIOS.  Refer to RetroBrew Computers Wiki for
-more information on UNA hardware support.
-
-For each of the ROM Images (".rom"), there are corresponding files
-with the extensions of ".com" and ".img".  The .com variant can be
-copied to a functional RomWBW-based system and executed like a
-normal application under CP/M or Z-System. This will load the new
-ROM on-the-fly.  It is an excellent way to test a ROM Image before
-actually burning it.  Similarly, the .img files can be loaded using
-the UNA FAT loader for testing.
-
-All of the standard ROM Images are configured for:
- - 512KB ROM Disk
- - 512KB RAM Disk
- - 38.4Kbps baud serial console (*)
- - Auto-discovery of all serial ports
-
-* RC2014 and Stephen Cousins' kits run at 115,200Kbps baud
-
-All hard disk type devices (IDE, PPIDE, CF Card, SD Card) will be
-automatically assigned at least two drive letters per device.  The
-drive letters will refer to the first 2 slices of the device. The
-ASSIGN command can be used to display and reassign drives to disk
-devices and slices as desired.
-
-Standard ROM Image Notes
-------------------------
-
-The standard ROM images will detect and install support for certain
-devices and peripherals that are on-board or frequently used with
-each platform as documented below.  If the device or peripheral is
-not detected at boot, the ROM will simply bypass support
-appropriately.
-
-SBC (SBC_std.rom):
- - CPU speed is detected at startup
- - Console on onboard UART serial port at 38400 baud
- - Includes support for PPIDE/CF Card(s) connected to on-board
-   parallel port.
- - Includes support for CVDU and VGA3 boards.  If detected at
-   startup, support for video and keyboard is installed
-   including VT-100/ANSI terminal emulation.
- - Auto detects DiskIO v3 floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Auto-detects PropIO or PropIO V2 and installs associated
-   video, keyboard and SD Card support if present.
- - If PropIO, PropIO V2, CVDU, or VGA hardware is detected,
-   initial console output is determined by JP2.  If JP2 is
-   shorted, console will go to on-board serial port, if JP2
-   is open, console will go to the detected video and keyboard
-   ports.
- - SBC V1 has a known race condition in the bank switching
-   circuit which is likely to cause system instability.  SBC
-   V2 does not have this issue.
-
-SBC (SBC_simh.rom):
- - SBC variant customized to run under SimH
- - Implments two emulated SimH hard disk images
- - Uses SimH RTC
-
-ZETA (ZETA_std.rom):
- - CPU speed is detected at startup
- - Console on onboard UART serial port at 38400 baud
- - Auto-detects FDC and installs 3.5" disk support
-   if found
- - Auto detects on-board floppy disk controller and installs
-   support for one attached 3.5" floppy disk if found
- - Auto-detects ParPortProp and includes support for it if it
-   is attached.
- - If ParPortProp is installed, initial console output is
-   determined by JP1.  If JP1 is shorted, console will go to
-   on-board serial port, if JP1 is open, console will go to
-   ParPortProp video and keyboard ports.
-
-ZETA2 (ZETA2_std.rom):
- - CPU speed is detected at startup
- - Console on onboard UART serial port at 38400 baud
- - Auto detects on-board floppy disk controller and installs
-   support for one attached 3.5" floppy disk if found
- - Auto-detects ParPortProp and includes support for it if it
-   is attached.
- - Uses CTC to generate periodic timer interrupts.
- - If ParPortProp is installed, initial console output is
-   determined by JP1.  If JP1 is shorted, console will go to
-   on-board serial port, if JP1 is open, console will go to
-   ParPortProp video and keyboard ports.
-
-N8 (N8_std.rom):
- - CPU speed is detected at startup
- - Console on Z180 onboard primary ASCI serial port at 38400 baud
- - Auto detects onboard floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Includes support for on-board TMS9918 video and keyboard
-   including VT-100/ANSI terminal emulation.
- - Includes support for on-board SD Card as hard disk and
-   assumes a production level N8 board (date code >= 2312).
-
-MK4 (MK4_std.rom):
- - CPU speed is detected at startup
- - Console on Z180 onboard primary ASCI serial port at 38400 baud
- - Includes support for on-board IDE port (CF Card via adapter).
- - Includes support for on-board SD Card port.
- - Auto detects Dual IDE floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Auto-detects PropIO or PropIO V2 and installs associated
-   video, keyboard and SD Card support if present.
- - Includes support for CVDU and VGA3 boards.  If detected at
-   startup, support for video and keyboard is installed
-   including VT-100/ANSI terminal emulation.
-
-RCZ80 (RCZ80_std.rom):
- - Assumes CPU oscillator of 7.3728 MHz
- - Requires 512K RAM/ROM module
- - Auto detects Serial I/O Module (ACIA), Dual Serial
-   Module (SIO/2), and EP Dual UART.
- - Console on whichever serial module is installed,
-   order of priority is UART, SIO, then ACIA.
- - Baud rate is determined by hardware, but normally 115200.
- - Auto support for RC2014 Compact Flash Module
- - Auto support for RC2014 PPIDE Module
- - Support for Scott Baker SIO board may be enabled in config
- - Auto detects WDC floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Support for SMC floppy controller may be enabled in config
- - Support for J.B. Lang TMS9918 video card may be enabled in config
- - Support for PropIO V2 may be enabled in config (PRPENABLE).  If
-   enabled, will auto-detect and install associated
-   video, keyboard and SD Card support if present.
-
-RCZ80 w/ KIO (RCZ80_kio.rom):
- - Same as RCZ80_std
- - Requires KIO module
- - SIO ports provided by KIO
-
-RCZ180 (RCZ180_nat.rom & RCZ180_ext.rom):
- - Assumes CPU oscillator of 18.432 MHz
- - Console on Z180 onboard primary ASCI serial port at 115200 baud
- - Auto support for RC2014 Compact Flash Module
- - Auto support for RC2014 PPIDE Module
- - Support for alternative serial modules may be enabled in config
- - Auto detects WDC floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Support for SMC floppy controller may be enabled in config
- - Support for J.B. Lang TMS9918 video card may be enabled in config
- - You must pick the variant (_ext or _nat) depending
-   on which memory module you are using:
-   - RCZ180_ext.rom uses external bank management to access
-     memory, such as the 512K RAM/ROM module.
-   - RCZ180_nat.rom uses the built-in Z180 memory manager
-     for use with memory modules using direct physical
-     addressing of memory, such as the SC119.
- - Support for PropIO V2 may be enabled in config (PRPENABLE).  If
-   enabled, will auto-detect and install associated
-   video, keyboard and SD Card support if present.
-
-RCZ280 (RCZ280_ext.rom, RCZ280_nat.rom, RCZ280_nat_zz.rom):
- - Assumes CPU oscillator of 24 MHz
- - Bus clock will be 6 MHz or 12 MHz, so does not match RC2014 standard!!!
- - Requires 512K RAM/ROM module (unless using ZZ80MB)
- - Auto detects Serial I/O Module (ACIA), Dual Serial
-   Module (SIO), EP Dual UART (DUART), and built-in Z280 UART (Z2U).
- - ACIA module is only supported on _ext variant.
- - Built-in Z280 UART (Z2U) is buffered and interrupt driven only
-   on _nat and _nat_zz variants.  It uses polling I/O on _ext.
- - Console on whichever serial module is installed,
-   order of priority is Z2U, UART, SIO, DUART, ACIA
- - Baud rate is determined by hardware, but normally 115200.
- - Auto support for RC2014 Compact Flash Module
- - Auto support for RC2014 PPIDE Module
- - Support for Scott Baker SIO board may be enabled in config
- - Auto detects WDC floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Support for SMC floppy controllers may be enabled in config
- - Support for J.B. Lang TMS9918 video card may be enabled in config
- - You must pick the variant (_ext, _nat, or _nat_zz) depending
-   on which platform or memory module you are using:
-   - RCZ280_ext.rom uses external bank management to access
-     memory, such as the 512K RAM/ROM module.
-   - RCZ280_nat.rom uses the built-in Z280 memory manager
-     for use with memory modules using direct physical
-     addressing of memory, such as the SC119.
-   - RCZ280_nat_zz.rom is specifically for the ZZ80MB platform
-     which has both CPU and memory onboard.
- - Support for PropIO V2 may be enabled in config (PRPENABLE).  If
-   enabled, will auto-detect and install associated
-   video, keyboard and SD Card support if present.
-
-SCZ180 (SCZ180_126.rom, SCZ180_130.rom, SCZ180_131.rom, SCZ140.rom):
- - Same as RCZ180
- - Adds auto support for onboard SPI SD Card
- - The 4 different variants of SCZ180 are provided to match the
-   4 corresponding systems (SC126, SC130, SC131, and SC140)
-   designed by Stephen Cousins.
- - Support for PropIO V2 may be enabled in config (PRPENABLE).  If
-   enabled, will auto-detect and install associated
-   video, keyboard and SD Card support if present.
-
-EZZ80 (EZZ80_std.rom):
- - Assumes CPU oscillator of 10.000 MHz
- - Console on primary SIO serial port at 115200 baud
- - Includes support for on-board SIO
- - Auto support for RC2014 Compact Flash Module
- - Auto support for RC2014 PPIDE Module
- - Auto detects WDC floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Support for SMC floppy controllers may be enabled in config
- - Support for PropIO V2 may be enabled in config (PRPENABLE).  If
-   enabled, will auto-detect and install associated
-   video, keyboard and SD Card support if present.
-
-DYNO (DYNO_std.rom):
- - Assumes CPU oscillator of 18.432 MHz
- - Console on Z180 onboard serial ports at 38400 baud
- - Includes support for BQ4842 RTC
- - Auto detects Dyno floppy disk controller and installs
-   support for two attached 3.5" floppy disks if found
- - Includes support for onboard PPIDE

Binary/ZPM3/Makefile

@@ -3,5 +3,5 @@ MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.spr)
 
 include $(TOOLS)/Makefile.inc
 
-clobber::
-	@rm -f *.spr
+clean::
+	@rm -f *.spr *.com *.sys *.dat *.zpm

Build.cmd

@@ -3,4 +3,4 @@ setlocal
 
 pushd Source && call Build %* || exit /b & popd
 
-pause
+if "%*" == "" pause

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+wwarthen@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Doc/ChangeLog.txt

@@ -1,3 +1,41 @@
+Version 3.3
+-----------
+- WBW: Support Front Panel switches
+- A?C: Preliminary support for Z80-Retro
+- A?C: Support for SD PIO
+- A?C: Support for Z80-Retro SD interface
+- WBW: Support per-drive floppy configuration
+- WBW: Support for Bill Shen's VGARC
+- WBW: Support for MG014 Parallel Port module + printer
+- WBW: Support for EMM Zip Drive on PPI interface (much inspiration from Alan Cox)
+- WBW: Support for PPA Zip Drive on PPI interface (much inspiration from Alan Cox)
+- WBW: Support for SyQuest SparQ Drive on PPI interface (much inspiration from Alan Cox)
+- WBW: Support for ATAPI Disk Drives (not CD-ROMs) on IDE and PPIDE interfaces
+- R?P: Added new disk images: Aztec C, MS BASIC Compiler, MS Fortran, Games, HiTech-C, Turbo Pascal, SLR Z80ASM
+- JBL: Added RCZ80 configuration for ColecoVision
+- WBW: Support for Z180 running interrupt mode 1
+- WBW: Preliminary support for S100 Computers Z180
+- WBW: Preliminary support for Dan Werner's ESP32 MBC Module
+- WBW: Early support for Duodyne base system (CPU/UART/ROM/RAM/RTC/SPK)
+- M?C: Fixed XM to allow specifying HBIOS port for send operations
+- WBW: Fix S100 Z180 LED operation (credit to Jay Cotton for finding this issue)
+- WBW: QPM system image is now combined with current CBIOS during build
+- WBW: Added framework for Heath platform
+- WBW: Support for USB Disks via CH375/CH376
+- D?J: Support for Raspberry Pi build process
+
+Version 3.2.1
+-------------
+- M?P: Fixed Zeta 2 FDD and CPUSPD config settings
+- WBW: Fixed SURVEY.COM (again)
+- DDW: Updates to DOS/65 binaries in disk images
+- PMS: Updates to VGMPLAY including support for YM2151
+- WBW: Fix for quark delay adjustment being trashed
+
+Version 3.2
+-----------
+- WBW: Version bump for release
+
 Version 3.1.1
 -------------
 - WBW: Version bumped due to pervasive changes
@@ -9,7 +47,7 @@ Version 3.1.1
 - HCS: ZRC memory manager support
 - S?K: Support for Tiny Z80 by Sergey
 - E?B: Support for v6 YM/AY sound card
-- C?M: Support for RC2014 bus PropIO V2
+- C?M: Support for RCBus bus PropIO V2
 - W?S: Updated FLASH software to v1.3.4
 - PMS: Preliminary support for writing to FLASH ROMs
 - PMS: Creation of process to update ROM system area w/o updating ROM disk contents
@@ -60,13 +98,22 @@ Version 3.1.1
 - D?T: Substantial update to TastyBasic incuding a .COM executable
 - PMS: Added VGM audio file player
 - WBW: ZPMLDR and ZPM3 fixes, credit to Lars Nelson for finding ZPM3 source!
+- DDW: Add support for MBC sound card
+- WBW: Add support for "romless" booting
+- L?N: Fixes for ZCPR-D&J (buffer overflow, default drive/user)
+- J?P: Add support for DS1501 RTC
+- LLS: Added a user defined mode for SD Card interfaces (not complete)
+- L?N: Updated ZDE to v1.8 including time stamp preservation fixes
+- D?M: Minor update to CP/NET client files, fix to CPNBOOT
+- WBW: Added p-System IV.0 Z80 implementation
+- WBW: Hacked SURVEY to work around bank switching crash
 
 Version 3.1
 -----------
 - WBW: Refactored ROM Loader
 - WBW: INTRTC periodic timer based clock
 - WBW: FDISK80 updated to allow reserving up to 256 slices
-- WBW: Added support dual 16C550 UART on RC2014 platform
+- WBW: Added support dual 16C550 UART on RCBus platform
 - WBW: Made .com images smaller (contain only Z-System now)
 - WBW: Support automatic clock hardware detection and fallback
 - WBW: Support use of CTC for SIO baud rate divisors
@@ -104,8 +151,8 @@ Version 2.9.2
 - WBW: Support two SIO modules w/ auto-detection
 - PMS: Support ECB USB-FIFO board
 - WBW: Fixed ASSIGN issue with incorrect DPB selection
-- WBW: Add RC2014 Z180 AY sound support to TUNE app
-- WBW: Add RC2014 AY sound support to AY driver
+- WBW: Add RCBus Z180 AY sound support to TUNE app
+- WBW: Add RCBus AY sound support to AY driver
 - WBW: Add SC126 platform
 - WBW: Config files cleanup
 - WBW: Add interrupt support to ASCI driver
@@ -124,7 +171,7 @@ Version 2.9.2
 - PMS: Add sound support to NASCOM BASIC
 - WBW: Updated FAT to add MD and FORMAT commands
 - WBW: Add CP/M 3 (experimental)
-- M?T: Support Shift register SPI WIZNET for RC2014
+- M?T: Support Shift register SPI WIZNET for RCBus
 - PLS: Added seconds register in HBIOS
 - WBW: More flexible table-driven config in TUNE.COM
 - PMS: Added timer support for Zilog Peripherals ECB Board
@@ -152,7 +199,7 @@ Version 2.9.2
 
 Version 2.9.1
 -------------
-- E?B: Added support for RC2014 RTC
+- E?B: Added support for RCBus RTC
 - WBW: Converted PTXPLAY to TUNE (now plays PT2/PT3/MYM sounds files)
 - WBW: Updated Win32DiskImager to v1.0
 - WBW: Implemented character attributes on Propeller based consoles
@@ -162,7 +209,7 @@ Version 2.9.1
 - WBW: Update default IOBYTE so that LST:=LPT: by default
 - WBW: Fixed missing drive/head setup for writes in PPIDE
 - WBW: Fixed XModem HBIOS console driver for file send operations
-- WBW: Preliminary support for RC180 platform (Z180 module in RC2014)
+- WBW: Preliminary support for RC180 platform (Z180 module in RCBus)
 - WBW: Added NZCOM distribution files to third slice of hard disk image
 - WBW: Fixed getnum32 bug in MODE command (found by Phil Summers)
 - PMS: Added serial support for Zilog Peripherals Baord
@@ -180,26 +227,26 @@ Version 2.9.1
 - WBW: Added timer interrupt support for CTC under Zeta 2 and Easy Z80
 - WBW: Support LBA style access in floppy driver
 - WBW: Added beta version of FAT filesystem utility (copy, dir, del, ren)
-- SCC: Added support for native memory addressing on Z180-based RC2014
+- SCC: Added support for native memory addressing on Z180-based RCBus
 - PMS: Dynamically discover and display processor type at boot
 - J?L: Added German keyboard support to PPK and KBD drivers
 
 Version 2.9.0
 -------------
 - WBW: Implemented multi-sector I/O in all disk drivers
-- WBW: Added support for RC2014 SMB Floppy controller modules (SMC and WDC)
+- WBW: Added support for RCBus SMB Floppy controller modules (SMC and WDC)
 - WBW: New function dispatching for character/disk/video drivers
-- WBW: Updated FDU app to support RC2014 floppy controllers
+- WBW: Updated FDU app to support RCBus floppy controllers
 - WBW: Added TIMER app to display system timer value
 - WBW: Refactored interrupt management code
 - WBW: Added PTXPLAY application and sample tunes
 
 Version 2.8.6
 -------------
-- WBW: Added support for RC2014 (SIO and ACIA drivers primarily)
+- WBW: Added support for RCBus (SIO and ACIA drivers primarily)
 - WBW: Automatically detect and run PROFILE.SUB on boot drive if it exists
 - WBW: Fixed Dual SD Board detection
-- WBW: Added console support to XModem (for RC2014 primarily)
+- WBW: Added console support to XModem (for RCBus primarily)
 - E?B: Fixed IDE/PPIDE when used with non-CF drives
 - WBW: Patched SUBMIT.COM so that it always puts temp file on A: for immediate execution
 - WBW: Accommodate spin up time for true IDE hard disks (IDE or PPIDE)

Doc/ReadMe.txt

@@ -6,17 +6,37 @@
 ***                                                                 ***
 ***********************************************************************
 
-This directory ("Doc") is part of the RomWBW System Software 
-distribution archive.  It contains documentation for components of 
+This directory ("Doc") is part of the RomWBW System Software
+distribution archive.  It contains documentation for components of
 the system.
 
+ChangeLog.txt
+-------------
+
+Log of changes in RomWBW by version.
+
+
+RomWBW User Guide ("RomWBW User Guide.pdf")
+RomWBW System Guide ("RomWBW System Guide.pdf")
+RomWBW Applications ("RomWBW Applications.pdf")
+RomWBW ROM Applications ("RomWBW ROM Applications.pdf")
+RomWBW Disk Catalog ("RomWBW Disk Catalog.pdf")
+RomWBW Errata ("RomWBW Errata.pdf")
+-------------------------------------------------------
+
+Documentation set for RomWBW.  The primary document is the
+User Guide.  The System Guide explains internal system operation
+and has a reference for the HBIOS API.  Use of included tools
+and utilities are detailed in the  Applications and
+ROM Applications documents.
+
 
 CPM Manual ("CPM Manual.pdf")
 -----------------------------
 
-The original DRI CP/M 2.x Operating System Manual.  This should be 
-considered the primary reference for system operation.  The section 
-on CP/M 2 Alteration can be ignored since this work has already been 
+The original DRI CP/M 2.x Operating System Manual.  This should be
+considered the primary reference for system operation.  The section
+on CP/M 2 Alteration can be ignored since this work has already been
 completed as part of the RomWBW distribution.
 
 
@@ -39,16 +59,10 @@ Manual for the DDTZ v2.7 debug tool included on the ROM drive.
 FDisk Manual ("FDisk Manual.pdf")
 ---------------------------------
 
-The operational manual for John Coffman's hard disk partitioning 
+The operational manual for John Coffman's hard disk partitioning
 program.  This program is included in RomWBW as FDISK80.
 
 
-Floppy Disk Utility Documentation ("FDU.tst")
----------------------------------------------
-
-Operational documentation for the RomWBW FDU application.
-
-
 Hard Disk Anatomy ("Hard Disk Anatomy.pdf")
 -------------------------------------------
 
@@ -61,17 +75,46 @@ NZCOM User's Manual ("NZCOM Users Manual.pdf")
 NZCOM operating system operation manual.
 
 
-RomWBW Architecture ("RomWBW Architecture.pdf")
------------------------------------------------
+ZCPR Manual ("ZCPR Manual.pdf")
+-------------------------------
 
-Document describing the architecture of the RomWBW HBIOS.  It 
-includes reference information for the HBIOS calls.
+ZCPR is the command proccessor portion of Z-System.  This is the
+manual for ZCPR 1.x as included in RomWBW.  The installation
+instructions can be ignored since that work has already been
+completed as part of the RomWBW distribution.
 
-ROM Applications ("ROM Applications.pdf")
------------------------------------------
+ZCPR D&J Manual ("ZCPR-DJ.doc")
+-------------------------------
 
-Breif instructions for the ROM based applications included in
-in the boot ROM.
+ZCPR D&J User Manual.  This manual supplements the ZCPR Manual.
+
+
+ZSDOS Manual ("ZSDOS Manual.pdf")
+---------------------------------
+
+ZSDOS is the DOS portion of Z-System.  This is the manual for ZSDOS
+1.x as included in RomWBW.  The installation instructions can be
+ignored since that work has already been completed as part of the
+RomWBW distribution.
+
+Microsoft Basic-80 Reference Manual v5.0 (Microsoft Basic-80 Reference Manual v5.0.pdf)
+---------------------------------------------------------------------------------------
+
+Official manual for Microsoft BASIC as included in RomWBW.
+
+
+QP/M 2.7 Installation Guide and Supplements ("qpm27.pdf")
+QP/M 2.7 Interface Guide ("qdos27.pdf")
+QP/M 2.7 Features and Facilities ("qcp27.pdf")
+--------------------------------------------
+
+Official documentation set for QP/M 2.7 from original QP/M distribution.
+
+SIO+CTC Baud Rate Options (SIO+CTC Baud Rate Options.pdf)
+---------------------------------------------------------
+
+Documents possible baud rates available based on different baud
+clock rates for Zilog SIO using CTC for baud rate clock generation.
 
 
 Z180 ASCI Baud Rate Options ("Z180 ASCI Baud Rate Options.pdf")
@@ -83,19 +126,43 @@ clock rate.  This document provides a list of the possible
 baud rates for typical CPU clock rates.
 
 
-ZCPR Manual ("ZCPR Manual.pdf")
--------------------------------
+UCSD p-System Users Manual ("UCSD p-System Users Manual.pdf")
+-------------------------------------------------------------
 
-ZCPR is the command proccessor portion of Z-System.  This is the 
-manual for ZCPR 1.x as included in RomWBW.  The installation 
-instructions can be ignored since that work has already been 
-completed as part of the RomWBW distribution.
+Official user manual for p-System operating system included with
+RomWBW.
 
 
-ZSDOS Manual ("ZSDOS Manual.pdf")
----------------------------------
+Z80 Assembler User Manual (z80asm (SLR Systems).pdf)
+----------------------------------------------------
 
-ZSDOS is the DOS portion of Z-System.  This is the manual fo ZSDOS 
-1.x as included in RomWBW.  The installation instructions can be 
-ignored since that work has already been completed as part of the 
-RomWBW distribution.
+Official user manual for the Z80 Macro Assembler by SLR Systems
+included in the z80asm disk image.
+
+
+HI-TECH C Compiler User Manual (HI-TECH Z80 C Compiler Manual.txt)
+------------------------------------------------------------------
+
+Official user manual for the HI-TECH C Compiler included in the
+hitechc disk image.
+
+
+Borland TurboPascal User Manual (Turbo_Pascal_Version_3.0_Reference_Manual_1986.pdf)
+------------------------------------------------------------------------------------
+
+Official user manual Borland TurboPascal included in the pascal disk image.
+
+
+Aztec C Compiler User Manual (Aztec_C_1.06_User_Manual_Mar84.pdf)
+-----------------------------------------------------------------
+
+Official user manual for the Aztec C Compiler included in the aztecc disk image.
+
+
+FORTRAN-80 User Manual (Microsoft_FORTRAN-80_Users_Manual_1977.pdf)
+---------------------------------------------------------------
+
+Official user manual for Microsoft's FORTRAN-80 compiler included in the fortran
+disk image.
+
+--WBW 5:18 PM 6/14/2023

Doc/Testing Notes.txt

@@ -23,7 +23,7 @@ Zeta 2 (X)
 - Test FD driver
 - Test FDU app
 
-RC2014 (X)
+RCBus (X)
 ------
 - Test SIO driver (Serial Module)
 - Test ACIA driver (Dual Serial Module)
@@ -40,7 +40,7 @@ N8-2312 (X)
 - Test FDU app
 - Test TMS driver (video & kbd)
 
-N8-2511 ( )
+N8-2511 (X)
 -------
 - Test ASCI driver
 - Test SD driver (Juha mode)
@@ -139,27 +139,6 @@ GENERAL (X)
 - ASSIGN app
 - MODE app
 - SYSCOPY app
-- OSLDR app
 - FDU app
 - FDISK80 app
 - TUNE app
-
-RESULTS
--------
-- Missing HBIOS startup banner (X)
-- PANIC while printing Serial device inventory (X)
-- Unexpected interrupt signals not handled well (X)
-- Fix IT_??? usage (X)
-- Fix HB_DI/HB_EI in PEEK/POKE/BNKCPY (X)
-- Fix SIMH timer interrupt setup (X)
-- Move DI/EI in PEEK/POKE/BNKCPY to API layer? (X)
-- RETI vs. JP in page zero when INTMODE = 0 (X)
-- Check interrupt stack space (X)
-- If an early INT fires, we return with INTs enabled (not good) (X)
-- PPPCON init should display ANSI 80x25 or similar (X)
-- Add INT MODE X message to early boot messages (X)
-- OSLDR fails when LDDS is loaded (X)
-- Add "!!!" to force assembly error as needed ( )
-- TIMER app should check for HBIOS active (X)
-- Halt system after bad interrupt??? ( )
-- Adapt and bundle PLAYER.COM (X)

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Makefile

@@ -1,20 +1,19 @@
 all:
-	$(MAKE) --directory Tools/unix
+	$(MAKE) --directory Tools
 	$(MAKE) --directory Source
 
 clean:
-	$(MAKE) --directory Tools/unix clean
+	$(MAKE) --directory Tools clean
 	$(MAKE) --directory Source clean
 	$(MAKE) --directory Binary clean
+	rm -f make.log
 
-clobber:
-	$(MAKE) --directory Tools/unix clobber
-	$(MAKE) --directory Source  clobber
-	$(MAKE) --directory Binary clobber
-	rm -f typescript
+clobber: clean
 
 diff:
 	$(MAKE) --directory Source diff
 
 dist:
-	$(MAKE) ROM_PLATFORM=dist
+	$(MAKE) ROM_PLATFORM=dist 2>&1 | tee make.log
+	$(MAKE) --directory Source clean
+	$(MAKE) --directory Tools clean

Source/Apps/Build.cmd

@@ -21,9 +21,6 @@ call :asm rtchb || exit /b
 
 zxcc Z80ASM -SYSGEN/F || exit /b
 
-zxcc MAC SURVEY.ASM -$PO || exit /b
-zxcc MLOAD25 -SURVEY.COM=SURVEY.HEX || exit /b
-
 pushd XM && call Build || exit /b & popd
 pushd FDU && call Build || exit /b & popd
 pushd Tune && call Build || exit /b & popd
@@ -34,6 +31,7 @@ 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
 
 copy *.com %APPBIN%\ || exit /b
 

Source/Apps/Clean.cmd

@@ -17,3 +17,4 @@ 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

Source/Apps/FDU/fdu.asm

@@ -38,7 +38,7 @@
 ;			DYNAMIC FDC SELECTION AT STARTUP
 ;			DYNAMIC CPU SPEED ADJUSTMENT
 ;   2017-12-16: V5.1	IMPROVED POLLING READ/WRITE PERFORMANCE
-;   2018-01-08: V5.2	ADDED RC2014 SUPPORT FOR:
+;   2018-01-08: V5.2	ADDED RCBUS SUPPORT FOR:
 ;			- SCOTT BAKER (SMB) SMC 9266 FDC
 ;			- SCOTT BAKER (SMB) WDC 37C65 FDC
 ;   2018-09-05: v5.3	ADDED SUPPORT FOR SMALLZ80
@@ -91,7 +91,7 @@ FDC_MBC		.EQU		11
 _DIO		.EQU		$01	; CUSTOM FOR DIO BOARD
 _DIO3		.EQU		$02	; CUSTOM FOR DIO3 BOARD
 _ZETA		.EQU		$04	; CUSTOM FOR ZETA
-_RCSMC		.EQU		$08	; CUSTOM FOR RC2014 SMB SMC MODULE
+_RCSMC		.EQU		$08	; CUSTOM FOR RCBUS SMB SMC MODULE
 _PCAT		.EQU		$10	; PC/AT MODE IN NEWER CONTROLLERS
 ;
 ;===============================================================================
@@ -465,11 +465,11 @@ FSS_MENU:
 	.TEXT	"  (D) Zeta 2 SBC Onboard FDC\r\n"
 	.TEXT	"  (E) Dual IDE ECB Board\r\n"
 	.TEXT	"  (F) N8 Onboard FDC\r\n"
-	.TEXT	"  (G) RC2014 SMC (SMB)\r\n"
-	.TEXT	"  (H) RC2014 WDC (SMB)\r\n"
+	.TEXT	"  (G) RCBus SMC (SMB)\r\n"
+	.TEXT	"  (H) RCBus WDC (SMB)\r\n"
 	.TEXT	"  (I) SmallZ80 Expansion\r\n"
 	.TEXT	"  (J) Dyno-Card FDC, D1030\r\n"
-	.TEXT	"  (K) RC2014 EPFDC\r\n"
+	.TEXT	"  (K) RCBus EPFDC\r\n"
 	.TEXT	"  (L) Multi-Board Computer FDC\r\n"
 	.TEXT	"  (X) Exit\r\n"
 	.TEXT	"=== OPTION ===> $\r\n"

Source/Apps/FDU/fdu.doc

@@ -1,6 +1,6 @@
 ================================================================
 Floppy Disk Utility (FDU) v5.3 for RetroBrew Computers 
-Disk IO / Zeta / Dual-IDE / N8 / RC2014 / SmallZ80 / Dyno
+Disk IO / Zeta / Dual-IDE / N8 / RCBus / SmallZ80 / Dyno
 ================================================================
 
 Updated January 5, 2020
@@ -33,7 +33,7 @@ like to acknowledge that much was derived from the previous
 work of Andrew Lynch and Dan Werner.  I also want to credit 
 Sergio Gimenez with testing the 5.25" drive support and Jim 
 Harre with testing the 8" drive support.  Support for Zeta 2 
-comes from Segey Kiselev.  Thanks!
+comes from Sergey Kiselev.  Thanks!
 
 General Usage
 -------------
@@ -74,7 +74,7 @@ supported:
  - Zeta 2
  - N8
  - Mark IV
- - RC2014
+ - RCBus
  - SmallZ80
  - Dyno
  - MBC
@@ -89,8 +89,8 @@ You must have one of the following floppy disk controllers:
  - Zeta SBC onboard FDC
  - Zeta 2 SBC onboard FDC
  - N8 SBC onboard FDC
- - RC2014 Scott Baker SMC-based Floppy Module
- - RC2014 Scott Baker WDC-based Floppy Module
+ - RCBus Scott Baker SMC-based Floppy Module
+ - RCBus Scott Baker WDC-based Floppy Module
  - SmallZ80 FDC
  - Dyno FDC
  - MBC FDC
@@ -99,7 +99,7 @@ Finally, you will need a floppy drive connected via an
 appropriate cable:
 
 Disk IO - no twist in cable, drive unit 0/1 must be selected by jumper on drive
-DISK IO 3, Zeta, Zeta 2, RC2014, Dyno - cable with twist, unit 0 after twist, unit 1 before twist
+DISK IO 3, Zeta, Zeta 2, RCBus, Dyno - cable with twist, unit 0 after twist, unit 1 before twist
 DIDE, N8, Mark IV, SmallZ80 - cable with twist, unit 0 before twist, unit 1 after twist
 
 Note that FDU does not utilize your systems ROM or OS to 
@@ -147,15 +147,16 @@ P5 (bd ID): 1-2, 3-4 (for $20-$3F port range)
 There are no specific N8 jumper settings, but the default
 I/O range starting at $80 is assumed in the published code.
 
-The RC2014 Scott Baker SMC-based floppy module should be jumpered
+The RCBus Scott Baker SMC-based floppy module should be jumpered
 for I/O base address 0x50 (SV1: 11-12), JP1 (TS) shorted,
 JP2 (/FAULT) shorted, JP3 (MINI): 2-3, JP4 (/DC/RDY): 2-3.
 
-The RC2014 Scott Baker WDC-based floppy module should be jumpered
+The RCBus Scott Baker WDC-based floppy module should be jumpered
 for I/O base address 0x50 (SV1: 11-12), JP1 (/DACK): 1-2,
-JP2 (TC): 2-3.
+JP2 (TC): 2-3.  Note that pin 1 of JPX jumpers is toward the bottom
+of the board.
 
-The RC2014 FDC by Alan Cox (Etched Pixels) needs to be strapped
+The RCBus FDC by Alan Cox (Etched Pixels) needs to be strapped
 for base I/O address 0x48.
 
 SmallZ80 does not have any relevant jumper settings.  The 
@@ -506,7 +507,7 @@ Improved polling version of read/write to fix occasional overrun errors.
 
 WW 1/8/2018: v5.2
 
-Added support for RC2014 hardware:
+Added support for RCBus hardware:
   - Scott Baker SMC 9266 FDC module
   - Scott Baker WDC 37C65 FDC module
 

Source/Apps/Makefile

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

Source/Apps/Survey/Build.cmd

@@ -0,0 +1,16 @@
+@echo off
+setlocal
+
+set TOOLS=..\..\..\Tools
+
+set PATH=%TOOLS%\zxcc;%PATH%
+
+set CPMDIR80=%TOOLS%/cpm/
+
+:: zxcc MAC survey.asm -$PO || exit /b
+:: zxcc MLOAD25 survey || exit /b
+
+zxcc M80 -,=survey/L/R
+zxcc L80 -survey,survey/N/E
+
+copy /Y survey.com ..\..\..\Binary\Apps\ || exit /b

Source/Apps/Survey/Clean.cmd

@@ -0,0 +1,8 @@
+@echo off
+setlocal
+
+if exist *.hex del *.hex
+if exist *.rel del *.rel
+if exist *.prn del *.prn
+if exist *.lst del *.lst
+if exist *.com del *.com

Source/Apps/Survey/Makefile

@@ -0,0 +1,6 @@
+OBJECTS = survey.com
+DEST = ../../../Binary/Apps
+TOOLS = ../../../Tools
+OTHERS = *.hex
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Survey/survey.mac

@@ -15,6 +15,17 @@
 ;
 ;VERSION LIST - Most recent version first.
 ;
+;21/Mar/23 - Previous hack was worthless because it broke
+;            the memory survey.  Rehacked to use HBIOS to
+;            detect if N8VEM SBC MPCL memory management is
+;            in use and bypass MPCL ports if so.  HBIOS check
+;            should allow use in non-RomWBW systems again.
+;            Wayne Warthen
+;
+;10/Feb/23 - Total hack to avoid crash on ECB SBC
+;            RomWBW now required by this version
+;            Wayne Warthen
+;
 ;16/Dec/17 - Handle 16-bit port addressing using
 ;            Z80 IN A,(C) instruction.     Wayne Warthen
 ;
@@ -234,7 +245,7 @@ TABS	EQU	9		; Tab columns
 ;	MAIN PROGRAM	;
 ;***********************;
 ;
-	ORG	100H
+	;ORG	100H
 ;
 START:
 	LXI	H,0			; Save stack pointer
@@ -242,9 +253,39 @@ START:
 	SHLD	OLDSP
 	LXI	SP,FINIS+64
 	CALL	TYPE			; Type initial CRLF
-	DB	TAB,TAB,'*** System Survey (December 17) ***'
+	DW	CRLF,CRLF
+	DB	TAB,'*** RomWBW System Survey (Mar 2023) ***'
 	DW	CRLF,CRLFE
+;
+; Are we running an N8VEM SBC w/ MPCL on RomWBW???
+;
+	.Z80
+	XOR	A		; assume not
+	LD	(ISMPCL),A	; save it
 
+	; Check for RomWBW (HBIOS)
+	LD	HL,(0FFFEH)	; HL := HBIOS ident location
+	LD	A,'W'		; First byte of ident
+	CP	(HL)		; Compare
+	JR	NZ,NOTMPCL	; Not HBIOS
+	INC	HL		; Next byte of ident
+	LD	A,NOT 'W'	; Second byte of ident
+	CP	(HL)		; Compare
+	JR	NZ,NOTMPCL	; Not HBIOS
+;
+	LD	B,0F1H		; HBIOS: VER function
+	LD	C,0		; required reserved value
+	RST	08		; DE := version, L := platform id
+	LD	A,L		; Platform ID
+	CP	01H		; SBC?
+	JR	NZ,NOTMPCL	; Not SBC
+	LD	A,0FFH		; Flag
+	LD	(ISMPCL),A	; Set flag
+;
+	.8080
+;
+NOTMPCL:
+;
 ;DISK SURVEY
 	LXI	H,8			; Init drive counter
 	MVI	C,24			; Get login vector
@@ -426,20 +467,19 @@ MSURV:
 	ENDM
 	DB	'|'
 	DW	CRLF
-	db	' '			; dmb 31-May-82
-	DB	'T'+EOL
+	DB	'TT','T'+EOL
 	LXI	H,RAM
-	MVI	M,LOW 1023		; Init RAM counter
+	MVI	M,LOW 2047		; Init RAM counter
 	INX	H
-	MVI	M,HIGH 1023
+	MVI	M,HIGH 2047
 	MVI	B,4			; Clear ROM, EMP
 CLREG:
 	INX	H
 	MVI	M,0
 	DCR	B
 	JNZ	CLREG
-	LXI	H,1024			; Init memory pointer
-	MVI	C,63			; K to be checked
+	LXI	H,2048			; Init memory pointer
+	MVI	C,62			; K to be checked
 
 ;Start of analysis loop
 BEGANA:
@@ -473,7 +513,7 @@ NOTEM:
 	INXI	ROM
 NEXT:
 	INX	H			; Index next byte
-	DCX	D			; Decrement K counter
+	DCX	D			; DEC DE; Decrement K counter
 	XRA	A
 	ORA	D
 	ORA	E
@@ -526,8 +566,19 @@ NEXTK:
 ; contents of first page
 	call	type
 	db	'BIOS at',' '+eol
-	hexout	bios+2
-	hexout	bios+1
+	;hexout	bios+2
+	;hexout	bios+1
+	.z80
+	ld	hl,(bios+1)
+	ld	de,-3
+	add	hl,de
+	push	hl
+	ld	a,h
+	call	hexprn
+	pop	hl
+	ld	a,l
+	call	hexprn
+	.8080
 	call	type
 	db	tab,'iobyte',' '+eol
 	hexout	bios+3
@@ -536,8 +587,19 @@ NEXTK:
 	hexout	bios+4
 	call	type
 	db	tab,'BDOS at',' '+eol
-	hexout	bdos+2
-	hexout	bdos+1
+	;hexout	bdos+2
+	;hexout	bdos+1
+	.z80
+	ld	hl,(bdos+1)
+	ld	de,-6
+	add	hl,de
+	push	hl
+	ld	a,h
+	call	hexprn
+	pop	hl
+	ld	a,l
+	call	hexprn
+	.8080
 	call	type
 	dw	crlf,crlfe
 ;
@@ -553,6 +615,8 @@ NEXTK:
 	CALL	TYPE
 	DB	' Bytes ROM',TAB,TAB+EOL
 	LHLD	BDOS+1
+	LXI	D,-6
+	DAD	D
 	CALL	BINDEC
 	CALL	TYPE
 	DB	' Bytes in TPA'
@@ -586,6 +650,21 @@ PDLY:
 	MOV	A,H			; ON CONSOLE STATUS PORT
 	ORA	L
 	JNZ	PDLY
+;
+	.Z80
+	; Check for Z180 CPU
+	xor	a			; assume Z80
+	ld	(IS180),a		; save it
+	ld	de,0506H		; 5 x 6
+	db	0EDH,05CH		; MLT DE: de = 30 if z180
+	ld	a,e			; result to A
+	cp	30			; check if multiply happened
+	jr	nz,z80			; if invalid, then Z80
+	or	0ffH			; flag value for Z180
+	ld	(IS180),a		; save it
+z80:
+	.8080
+;
 	LXI	H,0			; Init active port counter
 	mvi	d,0			; Init port counter
 	mvi	e,0ffh			; init port group variable
@@ -596,17 +675,83 @@ PORTLP:
 	CPI	SKIPORT
 	JZ	ISPORT			; Print mask port
 	ENDIF
+;
+	.Z80
+;
+	ld	a,(ISMPCL)		; MPCL?
+	or	a			; set flags
+	jr	z,PCONT			; if not, skip ahead
+	ld	a,d			; get port to test
+	and	0F8H			; range of 8 ports
+	cp	078H			; starting at 78H
+	jr	z,ISPORT		; if in range, assume real port
+;
+PCONT:
 
-	mov	c,a			; port number to reg c
-	mvi	b,0			; for 16 bit  port addressing
-	db	0edh,078h		; z80: in a,(c)
-; inactive port could return 0xFF or 0x78 or the port address
-	cmp	c
-	jz	nextpt
-	cpi	0FFh
-	jz	nextpt
-	cpi	078h
-	jz	nextpt
+	di				; interrupts off
+	ld	a,(IS180)		; Z180?
+	or	a
+	jr	nz,rd180
+;
+	; Z80 port read
+	; Read port using IN A,(C), push result
+	ld	a,d
+	ld	c,a
+	ld	(pnum0a),a		; dynamic update
+	ld	(pnum0b),a		; dynamic update
+	ld	b,0
+	in	a,(c)
+	push	af
+	; Read port using IN A,(port), push result
+	in	a,(0ffh)		; IN0
+pnum0a	equ	$-1
+	push	af
+	; Read port using IN A,(port), push result
+	in	a,(0ffh)		; IN0
+pnum0b	equ	$-1
+	push	af
+	jr	rdz
+;
+rd180:
+	; Z180 port read
+	; Read port using IN A,(C), push result
+	ld	a,d
+	ld	c,a
+	ld	(pnum1a),a		; dynamic update
+	ld	(pnum1b),a		; dynamic update
+	ld	b,0
+	in	a,(c)
+	push	af
+	; Read port using IN0 A,(port), push result
+	db	0EDH,038H,0FFH		; IN0
+pnum1a	equ	$-1
+	push	af
+	; Read port using IN0 A,(port), push result
+	db	0EDH,038H,0FFH		; IN0
+pnum1b	equ	$-1
+	push	af
+;
+rdz:
+;
+	ei				; interrupts back on now
+;
+; port is considered inactive if values read from different port
+; read mechanisms differ or if the value $FF is read consistently,
+; or if the value read is equal to the port number itself
+;
+	pop	bc			; second IN0 (port) value
+	pop	af			; first IN0 (port) valule
+	cp	b			; same?
+	pop	bc			; IN (C) value
+	jr	nz,ISPORT		; if no, active running ctr port
+	cp	b			; same?
+	jr	nz,NEXTPT		; if not, inactive port
+	cp	0FFh			; pullup value???
+	jr	z,NEXTPT		; if so, consider not active
+	cp	d			; value same as port num???
+	jr	z,NEXTPT		; if so, consider not active
+;
+	.8080
 ISPORT:
 	mov	a,d			; got a live one, probably
 	ani	0f0h			; is port in same group as last ?
@@ -708,7 +853,6 @@ BITSHF:
 	JNZ	BITSHF
 	RET
 
-
 ;***********************;
 ;	DATA STORAGE	;
 ;***********************;
@@ -722,6 +866,9 @@ RAMF:	DS	1			; RAM good flag
 EMPF:	DS	1			; Empty so far flag
 BLKSHF:	DS	1			; block shift factor
 MAXALL:	DS	2			; maximum block number
+IS180:	DS	1			; non-zero for Z180 CPU
+ISMPCL:	DS	1			; non-zero for N8VEM SBC MPCL
 FINIS	EQU	$			; End of program
+;
 	END
 

Source/Apps/Test/2piotst/2piotst.mac

@@ -0,0 +1,567 @@
+; 24.9.2018 PMS (b1ackmai1er)
+; Modified version for ECB-ZILOG PERIPHERALS BOARD - TEST 2 PIO's
+; 01.11.2011 WKA
+; Assembler M80
+; ECB-4PIO
+; Testprogramm f<>r die I/O-Karte ECB-4PIO in Z80-Mnemonics
+
+	PAGE 	72
+	.Z80
+	ASEG
+	ORG 	100H
+;
+;CP/M-ADDRESSES
+;* * * * * * * 
+;
+BOOT	EQU 0		;WARMBOOT CP/M
+BDOS	EQU 5		;ENTRY BDOS
+NMI	EQU 66H		;Error-ROUTINE
+;
+;CONSOLE-CODES
+;* * * * * * *
+;
+EOT	EQU 4		;END OF TEXT
+BS	EQU 8		;BACKSPACE
+TAB	EQU 9		;TABULATOR
+LF	EQU 0AH		;LINE-FEED
+CR	EQU 0DH		;CARRIAGE-RETURN
+FF	EQU 0CH		;FORM-FEED
+ESC	EQU 1BH		;ESCAPE
+CTRLC	EQU 'C'-40H	;CONTROL-C
+CTRLW	EQU 'W'-40H	;CONTROL-W
+CTRLX	EQU 'X'-40H	;CONTROL-X
+CTRLY	EQU 'Y'-40H	;CONTROL-Y
+CTRLZ	EQU 'Z'-40H	;CONTROL-Z
+;
+BASE 	EQU 0B8H 	; 4 DIL-SCHALTER
+;
+PIO0AD	EQU BASE+0 	; PIO 0 A DATEN
+PIO0AC	EQU BASE+2 	; PIO 0 A CONTROL
+PIO0BD	EQU BASE+1 	; PIO 0 B DATEN
+PIO0BC	EQU BASE+3 	; PIO 0 B CONTROL
+;
+PIO1AD	EQU BASE+4 	; PIO 1 A DATEN
+PIO1AC	EQU BASE+6 	; PIO 1 A CONTROL
+PIO1BD	EQU BASE+5 	; PIO 1 B DATEN
+PIO1BC	EQU BASE+7 	; PIO 1 B CONTROL
+;
+MAIN:	LD	DE,PIO_SRTMSG
+	CALL	PSTRIN
+;
+	LD	DE,INI_MSG
+	CALL	PSTRIN
+	CALL	INIT
+;
+	LD	DE,PIO0ADW	;PIO0 A
+	CALL	PSTRIN
+	LD	A,55H
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO0AD),A
+	IN	A,(PIO0AD)
+	PUSH	AF
+;
+	LD	DE,PIO0ADR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO0ADW
+	CALL	PSTRIN
+	LD	A,0AAH
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO0AD),A
+	IN	A,(PIO0AD)
+	PUSH	AF
+;
+	LD	DE,PIO0ADR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO0BDW	;PIO0 B
+	CALL	PSTRIN
+	LD	A,55H
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO0BD),A
+	IN	A,(PIO0BD)
+	PUSH	AF
+;
+	LD	DE,PIO0BDR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO0BDW
+	CALL	PSTRIN
+	LD	A,0AAH
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO0BD),A
+	IN	A,(PIO0BD)
+	PUSH	AF
+;
+	LD	DE,PIO0BDR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO1ADW	;PIO1 A
+	CALL	PSTRIN
+	LD	A,55H
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO1AD),A
+	IN	A,(PIO1AD)
+	PUSH	AF
+;
+	LD	DE,PIO1ADR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO1ADW
+	CALL	PSTRIN
+	LD	A,0AAH
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO1AD),A
+	IN	A,(PIO1AD)
+	PUSH	AF
+;
+	LD	DE,PIO1ADR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO1BDW	;PIO1 B
+	CALL	PSTRIN
+	LD	A,55H
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO1BD),A
+	IN	A,(PIO1BD)
+	PUSH	AF
+;
+	LD	DE,PIO1BDR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO1BDW
+	CALL	PSTRIN
+	LD	A,0AAH
+	PUSH	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+ 	CALL	PSTRIN
+	POP	AF
+	OUT	(PIO1BD),A
+	IN	A,(PIO1BD)
+	PUSH	AF
+;
+	LD	DE,PIO1BDR
+	CALL	PSTRIN
+	POP	AF
+	CALL	OUTB
+	LD	DE,LINE_E
+	CALL	PSTRIN
+;
+	LD	DE,PIO_ENDMSG
+	CALL	PSTRIN
+	JP	BOOT
+;
+;==========================================================================
+INIT:	LD 	HL,PIO0T	; PIO0 INITITALISIEREN
+	CALL 	INITX
+        LD 	HL,PIO1T 	; PIO1 INITITALISIEREN
+        CALL 	INITX
+	RET
+;
+INITX:	LD 	A,(HL) 		; BYTE-ANZAHL
+	OR 	A
+	RET 	Z
+	LD 	B,A		; Port-Adresse nach C
+        INC 	HL
+        LD 	C,(HL)
+        INC 	HL
+        OTIR
+        JR 	INITX
+;
+PIO0T:	DEFB 05 		; 5 BYTE ZUM PIO 0 A CONTROL
+	DEFB PIO0AC
+        DEFB 00000011B 		; DIS-INT
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 11001111B 		; BETR.ART BIT EIN/AUSG.
+        DEFB 00000000B 		; ALLES AUSG.
+        DEFB 01 		; 1 BYTE ZUM PIO 0 A DATEN
+	DEFB PIO0AD
+        DEFB 00000000B		; DATEN "LOW"
+;
+        DEFB 05 		; 5 BYTE ZUM PIO 0 B CONTROL
+	DEFB PIO0BC
+        DEFB 00000011B 		; DIS-INT
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 01001111B		; BETR.ART BYTE EINGABE
+        DEFB 11001111B 		; BETR.ART BIT EIN/AUSG.
+        DEFB 00000000B 		; ALLES AUSG.
+        DEFB 01 		; 1 BYTE ZUM PIO 0 B DATEN
+	DEFB PIO0BD
+        DEFB 00000000B		; DATEN "LOW"
+        DEFB 0 			; ENDE PIO 0 B -TABELLE
+;
+PIO1T:	DEFB 05 		; 5 BYTE ZUM PIO 1 A CONTROL
+	DEFB PIO1AC
+        DEFB 00000011B 		; DIS-INT
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 11001111B 		; BETR.ART BIT EIN/AUSG.
+        DEFB 00000000B 		; ALLES AUSG.
+        DEFB 01 		; 1 BYTE ZUM PIO 1 A DATEN
+	DEFB PIO1AD
+        DEFB 00000000B		; DATEN "LOW"
+;
+        DEFB 05 		; 5 BYTE ZUM PIO 1 B CONTROL
+	DEFB PIO1BC
+        DEFB 00000011B 		; DIS-INT
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 01001111B 		; BETR.ART BYTE EINGABE
+        DEFB 11001111B 		; BETR.ART BIT EIN/AUSG.
+        DEFB 00000000B 		; ALLES AUSG.
+        DEFB 01 		; 1 BYTE ZUM PIO 1 B DATEN
+	DEFB PIO1BD
+        DEFB 00000000B		; DATEN "LOW"
+        DEFB 0 			; ENDE PIO 1 B -TABELLE
+;
+;==========================================================================
+;
+;Output on Screen
+;****************
+;
+PRBS:	LD E,BS
+	CALL PCHAR
+	RET
+;
+;Output CR+LF on Screen
+;**********************
+;
+CRLF:	LD E,CR
+	CALL PCHAR
+	LD E,LF
+	CALL PCHAR
+	RET
+;
+;Output ASCII-Character
+;**********************
+;
+PRINP:	PUSH AF
+	LD E,A
+	CALL PCHAR
+	POP AF
+	RET;
+;
+;CALL BDOS with Register Save
+;****************************
+;
+INCHA:	LD C,1		;INPUT CHARACTER TO A
+	JR BDO
+PCHAR:	LD C,2		;PRINT CHARACTER IN E
+	JR BDO
+PSTRIN:	LD C,9		;PRINT STRING
+	JR BDO
+INBUFF:	LD C,10		;READ CONSOLE-BUFFER
+	JR BDO
+CSTS:	LD C,11		;CONSOLE-STATUS
+	JR BDO
+OPEN:	LD C,15		;OPEN FILE
+	JR BDO
+CLOSE:	LD C,16		;CLOSE FILE
+	JR BDO
+DELETE:	LD C,19		;DELETE FILE
+	JR BDO
+READS:	LD C,20		;READ SEEK
+	JR BDO
+WRITES:	LD C,21		;WRITE SEEK
+	JR BDO
+MAKE:	LD C,22		;MAKE FILE
+	JR BDO
+SETDMA:	LD C,26		;SET DMA-ADDRESS
+BDO:	PUSH HL
+	PUSH DE
+	PUSH BC
+	PUSH IX
+	PUSH IY
+	CALL BDOS
+	POP IY
+	POP IX
+	POP BC
+	POP DE
+	POP HL
+	RET
+;
+;DIRECT CONSOLE INPUT
+;********************
+;
+INDCON:	CALL INDCOX
+	CP 0
+	JR Z,INDCON
+	RET
+;
+INDCOX:	LD C,6		;Code for Direct Console Input
+	LD E,0FFH	;Code for Input
+	PUSH HL
+	PUSH DE
+	PUSH BC
+	PUSH IX
+	PUSH IY
+	CALL BDOS
+	POP IY
+	POP IX
+	POP BC
+	POP DE
+	POP HL
+	RET
+;
+;
+;Output WORD
+;***********
+;
+;PARAMETER: Entry WORD IN HL
+;*********
+;
+OUTW:	LD A,H
+	CALL OUTB
+	LD A,L
+	CALL OUTB
+	RET
+;
+;Output BYTE
+;***********
+;
+;PARAMETER: Entry BYTE IN A
+;*********
+;
+OUTB:	PUSH AF
+	RRCA
+	RRCA
+	RRCA
+	RRCA
+	AND 0FH
+	CALL HBTHE	;Change Half-BYTE
+	POP AF
+	AND 0FH
+	CALL HBTHE
+	RET
+;
+;Output HALF-BYTE
+;****************
+;
+;PARAMETER: Entry Half-BYTE IN A (BIT 0 - 3)
+;*********
+;
+HBTHE:	CP 0AH
+	JR C,HBTHE1
+	ADD A,7		;Character to Letter
+HBTHE1:	ADD A,30H
+	LD E,A
+	CALL PCHAR
+	RET
+;
+;Input ADDRESS
+;*************
+;
+;PARAMETER: Exit with ADDRESS IN HL
+;*********
+;
+INADR:	LD HL,0
+INADR1:	CALL INCHAR	;Input TETRADE
+	LD D,A
+	CALL INBYT1	;IN HEXA
+	RET C		;END OF Input
+	ADD HL,HL
+	ADD HL,HL
+	ADD HL,HL
+	ADD HL,HL
+	OR L
+	LD L,A
+	JR INADR1	;New Key
+;
+;
+;Input BYTE
+;**********
+;
+;PARAMTER: Exit with BYTE IN A
+;********
+;
+INBYT:	CALL INADR
+	LD A,L
+	RET
+;
+;Input of one TETRADE to A (BIT 0-3)
+;************************************
+;
+INBYT1:	SUB '0'
+	RET C
+	CP 'G'-30H
+	JR NC,INBYT3	;Error
+	CP ':'-30H
+	JR C,INBYT2
+	CP 'A'-30H
+	JR C,INBYT3	;Error
+	SUB 7
+INBYT2:	OR A
+	RET
+;
+INBYT3:	SCF
+	RET
+;
+;Input ASCII-Character to A
+;**************************
+;
+INCON:	CALL INDCON	;Input ASCII-Character to A
+	CP CTRLC	;TEST CONTROL-C
+	JP Z,QUIT
+	CP CTRLX	;TEST CONTROL-X
+	JR Z,INCHA1
+	CP CTRLW	;TEST CONTROL-W
+	JR Z,INCHA3
+	CP CTRLY	;TEST CONTROL-Y
+	JR Z,INCHA2
+	CP BS
+	RET Z
+	CP CR
+	RET Z
+	CP ' '
+	JR C,INCON
+	JR INCH1
+;
+INCHAR:	CALL INCHA	;Input ASCII-Character to A
+	CP CTRLC	;TEST CONTROL-C
+	JR Z,QUIT
+	CP CTRLX	;TEST CONTROL-X
+	JR Z,INCHA1
+	CP CTRLW	;TEST CONTROL-W
+	JR Z,INCHA3
+	CP CTRLY	;TEST CONTROL-Y
+	JR Z,INCHA2
+	CP BS
+	RET Z
+	CP CR
+	RET Z
+	CP ' '
+	JR C,INCHAR	;Input invalied
+;
+INCH1:	CP 'A'
+	RET C		;Character ok
+;
+	RES 5,A		;lower case -> upper case
+	RET
+INCHA1:	POP HL
+	LD E,FF
+	CALL PCHAR	;Clear screen
+	JP GOON
+INCHA2:	POP HL
+	LD E,FF
+	CALL PCHAR	;Clear screen
+	JP GOON
+INCHA3:	LD E,FF
+	CALL PCHAR
+	RET
+;
+;ABBRUCH DER BEARBEITUNG
+;***********************
+;
+COMPLT:	LD DE,TCOMP
+	CALL PSTRIN
+	JP GOON
+QUIT:	CALL CRLF
+	LD DE,TQUIT
+	JR FINIS
+INTTIM:	POP DE		;STACK OK
+;	CALL DESAK
+	LD DE,TNMIAB
+	CALL PSTRIN
+	LD DE,MAIN	;NEW ADDRESS
+	PUSH DE
+	RETN
+FINIS:	CALL PSTRIN	;AT BDOS-ERROR
+GOON:
+	JP BOOT
+;
+;
+;TEXT-Messages
+;*************
+;
+TCOMP:	DEFB ESC,21,0,14H,ESC,23,0
+	DEFM 'Function complete !!$'
+TQUIT:	DEFB ESC,23,0,14H,7
+	DEFM 'End Run RAMFTEST$'
+TNMIAB:	DEFB ESC,23,0,14H
+	DEFM 'Time Out !!$'
+;
+;
+INI_MSG:DEFM	'ECB-4PIO Init all PIO Bit-Mode ',CR,LF,'$'
+PIO0ADW:DEFM	'ECB-4PIO Write to  PIO0AD ','$'
+PIO0ADR:DEFM	'ECB-4PIO Read from PIO0AD ','$'
+PIO0BDW:DEFM	'ECB-4PIO Write to  PIO0BD ','$'
+PIO0BDR:DEFM	'ECB-4PIO Read from PIO0BD ','$'
+PIO1ADW:DEFM	'ECB-4PIO Write to  PIO1AD ','$'
+PIO1ADR:DEFM	'ECB-4PIO Read from PIO1AD ','$'
+PIO1BDW:DEFM	'ECB-4PIO Write to  PIO1BD ','$'
+PIO1BDR:DEFM	'ECB-4PIO Read from PIO1BD ','$'
+
+PIO_SRTMSG:
+	DEFM	'ECB-ZILOG PERIPHERALS start test 1.0',CR,LF,'$'
+PIO_ENDMSG:	
+	DEFM	'ECB-ZILOG PERIPHERALS end test 1.0',CR,LF,'$'
+LINE_E:	DEFM	'H',CR,LF,'$'
+;
+	IF1
+	.PRINTX 'Pass 1 complete'
+	ENDIF
+;
+	IF2
+	.PRINTX 'Pass 2 complete'
+	.PRINTX 'Assembly complete'
+	ENDIF
+;
+	END	
+

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

@@ -0,0 +1,13 @@
+@echo off
+setlocal
+
+set TOOLS=..\..\..\..\Tools
+
+set PATH=%TOOLS%\zxcc;%PATH%
+
+set CPMDIR80=%TOOLS%/cpm/
+
+zxcc M80 -=2piotst/l || exit /b
+zxcc L80 -2piotst,2piotst.com/n/e || exit /b
+
+copy /Y 2piotst.com ..\..\..\..\Binary\Apps\Test\ || exit /b

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

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

Source/Apps/Test/2piotst/Makefile

@@ -0,0 +1,8 @@
+OBJECTS = 2piotst.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+OTHERS = *.rel
+
+include $(TOOLS)/Makefile.inc
+
+2piotst.com : 2piotst.rel

Source/Apps/Test/Build.cmd

@@ -20,6 +20,10 @@ 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
 
 goto :eof
 

Source/Apps/Test/Clean.cmd

@@ -17,3 +17,7 @@ pushd rzsz && call Clean || exit /b 1 & popd
 pushd vdctest && call Clean || exit /b 1 & popd
 pushd kbdtest && call Clean || exit /b 1 & popd
 pushd ps2info && call Clean || exit /b 1 & popd
+pushd 2piotst && call Clean || exit /b 1 & popd
+pushd piomon && call Clean || exit /b 1 & popd
+pushd banktest && call Clean || exit /b 1 & popd
+pushd portscan && call Clean || exit /b 1 & popd

Source/Apps/Test/DMAmon/Readme.txt

@@ -1 +1,8 @@
 DMAmon is a program to verify operation of the Z80 MBC DMA board
+
+Version 2 has been hacked to include testing for interrupts.  This
+requires running the application under RomWBW using IM2.  There
+is an equate in the source file to disable interrupt testing
+if needed.
+
+--WBW 10:36 AM 3/14/2022

Source/Apps/Test/DMAmon/dmamon.sh

@@ -1,3 +0,0 @@
-~/RomWBW-dev/Tools/unix/uz80as/uz80as -t z80 dmamon.asm dmamon.bin
-#srec_cat dmamon.bin -binary -offset 0x0100 --address-length=2 -o dmamon.hex -Intel
-cat dmamon.bin > dmamon.com

Source/Apps/Test/I2C/Build.cmd

@@ -8,6 +8,8 @@ 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 -ff srom.asm srom.com srom.lst || exit /b
 
 copy /Y i2c*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 copy /Y rtcds7*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
+copy /Y srom.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/I2C/Makefile

@@ -1,4 +1,4 @@
-OBJECTS = i2cscan.com rtcds7.com i2clcd.com
+OBJECTS = i2cscan.com rtcds7.com i2clcd.com srom.com
 DEST = ../../../../Binary/Apps/Test/
 TOOLS = ../../../../Tools
 

Source/Apps/Test/I2C/i2cscan.asm

@@ -5,12 +5,13 @@
 ; MARCO MACCAFERRI, HTTPS://WWW.MACCASOFT.COM
 ; HBIOS VERSION BY PHIL SUMMERS (B1ACKMAILER) DIFFICULTLEVELHIGH@GMAIL.COM
 ;
-PCF	.EQU	1
-P8X180	.EQU	0
-SC126	.EQU	0
-SC137	.EQU	0
+PCFECB		.EQU	0
+PCFDUO		.EQU	1
+P8X180		.EQU	0
+SC126		.EQU	0
+SC137		.EQU	0
 ;
-#IF (PCF)
+#IF (PCFECB)
 I2C_BASE 	.EQU  	0F0H
 PCF_ID   	.EQU  	0AAH
 CPU_CLK	 	.EQU  	12
@@ -20,6 +21,16 @@ PCF_RS1  	.EQU  	PCF_RS0+1
 PCF_OWN	 	.EQU  	(PCF_ID >> 1)        	; PCF'S ADDRESS IN SLAVE MODE
 #ENDIF
 ;
+#IF (PCFDUO)
+I2C_BASE 	.EQU  	056H
+PCF_ID   	.EQU  	0AAH
+CPU_CLK	 	.EQU  	12
+;
+PCF_RS0  	.EQU  	I2C_BASE
+PCF_RS1  	.EQU  	PCF_RS0+1
+PCF_OWN	 	.EQU  	(PCF_ID >> 1)        	; PCF'S ADDRESS IN SLAVE MODE
+#ENDIF
+;
 #IF (P8X180)
 I2C_BASE	.EQU	0A0h
 _sda		.EQU	0
@@ -153,8 +164,11 @@ lp5f:	ld	a,(addr)	; next address
 	jp	0
 
 signon:	.db	"I2C Bus Scanner"
-#IF (PCF)
-	.DB	" - PCF8584"
+#IF (PCFECB)
+	.DB	" - PCF8584 (ECB)"
+#ENDIF
+#IF (PCFDUO)
+	.DB	" - PCF8584 (Duodyne)"
 #ENDIF
 #IF (SC126)
 	.DB	" - SC126"
@@ -219,7 +233,7 @@ _cout:				; character
 	ret
 
 ;-----------------------------------------------------------------------------
-#IF (PCF)
+#IF (PCFECB | PCFDUO)
 _i2c_start:
 PCF_START:
         LD     A,PCF_START_  
@@ -418,7 +432,7 @@ PCF_PINFAIL 	.DB	"PIN FAIL$"
 PCF_BBFAIL	.DB	"BUS BUSY$"
 ;
 ;-----------------------------------------------------------------------------
-#IF (PCF)
+#IF (PCFECB | PCFDUO)
 _i2c_stop:  
 PCF_STOP: 
 	LD   	A,PCF_STOP_	; issue 

Source/Apps/Test/Makefile

@@ -1,5 +1,5 @@
 OBJECTS = 
-SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info
+SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info 2piotst piomon banktest portscan
 DEST = ../../../Binary/Apps/Test
 TOOLS =../../../Tools
 

Source/Apps/Test/banktest/Build.cmd

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

Source/Apps/Test/banktest/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/banktest/Makefile

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

Source/Apps/Test/banktest/banktest.asm

@@ -0,0 +1,563 @@
+;===============================================================================
+; BANKTEST - Test RomWBW bank management API
+;
+;===============================================================================
+;
+;	Author:  Wayne Warthen (wwarthen@gmail.com)
+;_______________________________________________________________________________
+;
+; Usage:
+;   BANKTEST
+;
+; Operation:
+;   Steps through a series of banking API tests
+;_______________________________________________________________________________
+;
+; Change Log:
+;   2023-01-22 [WBW] Initial release
+;_______________________________________________________________________________
+;
+; ToDo:
+;_______________________________________________________________________________
+;
+;===============================================================================
+; Definitions
+;===============================================================================
+;
+runloc	.equ	$C000		; Running location (upper memory required)
+stksiz	.equ	$40		; Working stack size
+;
+restart	.equ	$0000		; CP/M restart vector
+;
+#include "../../../ver.inc"
+;
+#include "../../../HBIOS/hbios.inc"
+;
+;===============================================================================
+; Code Section
+;===============================================================================
+;
+	.org	$100
+;
+	; relocate worker code to upper memory
+	ld	hl,begin	; start of working code image
+	ld	de,runloc	; running location
+	ld	bc,size		; size of working code image
+	ldir			; copy to upper RAM
+	jp	runloc		; and go
+;
+; Start of working code
+;
+begin	.equ	$		; image loaded here
+;
+	.org	runloc		; now generate running location adresses
+;
+	; setup stack (save old value)
+	ld	(stksav),sp	; save stack
+	ld	sp,stack	; set new stack
+;
+	; initialization
+	call	init		; initialize
+	jr	nz,exit		; abort if init fails
+;
+	; process
+	call 	process		; do main processing
+	jr	nz,exit		; abort on error
+;
+exit:	; clean up and return to command processor
+	call	crlf		; formatting
+	ld	sp,(stksav)	; restore stack
+	;jp	restart		; return to CP/M via restart
+	ret			; return to CP/M w/o restart
+;
+; Initialization
+;
+init:
+	call	crlf2		; formatting
+	ld	de,msgban	; point to version message part 1
+	call	prtstr		; print it
+;
+	call	idbio		; identify active BIOS
+	cp	1		; check for HBIOS
+	jp	nz,errbio	; handle BIOS error
+;
+	ld	a,rmj << 4 | rmn	; expected HBIOS ver
+	cp	d		; compare with result above
+	jp	nz,errbio	; handle BIOS error
+;
+initx
+	; initialization complete
+	xor	a		; signal success
+	ret			; return
+;
+; Process
+;
+process:
+;
+; Start by testing a bank switch and dumping some memory
+; from the new bank.
+;
+	di
+;
+	; Get and display current RAM bank
+	ld	b,BF_SYSGETBNK	; HBIOS GetBank function
+	rst	08		; do it via RST vector, C=bank id
+	ld	a,c		; put bank id in A
+	push	af		; save bank id returned
+	call	crlf2
+	ld	de,msgcur	; load message
+	call	prtstr		; print it
+	pop	af		; restore bank id
+	call	prthex		; print the bank id
+;
+	; Switch to first RAM bank
+	ld	b,BF_SYSSETBNK	; HBIOS SetBank function
+	ld	c,$80		; first RAM bank
+	rst	08		; do it via RST vector
+	ld	a,c		; original bank id to accum
+	ld	(orgbnk),a	; save it
+;
+; NOTE: Once the page zero of the default bank is swapped out, we
+; cannot use RST 08 for HBIOS function calls because the vector is
+; no longer in context.  Instead, we rely on the alternate call
+; address entry point.
+;
+	; Do an HBIOS function call while bank switched
+	call	crlf2
+	ld	de,msg80	; message to print
+	call	prtstr		; do it
+;
+	; Dump chunk of memory from bank
+	call	crlf
+	ld	de,0		; from 0x0000
+	call	dump_buffer
+;
+	; Switch back to original bank
+	ld	b,BF_SYSSETBNK	; HBIOS SetBank function
+	ld	a,(orgbnk)	; get original bank back
+	ld	c,a		; to C for function call
+	call	HB_INVOKE	; do it via call
+;
+	ei
+;
+; Now poke a small procedure into an alternate bank and do an
+; inter-bank call to execute it.
+;
+	; Copy test procedure to a foreign bank
+	ld	b,BF_SYSSETCPY	; HBIOS SysSetCopy function
+	ld	a,(orgbnk)	; our current bank is source
+	ld	e,a		; put in D
+	ld	d,xproc_bnk	; target bank is 0x80
+	ld	hl,xproc_len	; length to copy
+	rst	08		; do it
+;
+	ld	b,BF_SYSBNKCPY	; HBIOS SysBnkCopy function
+	ld	de,xproc_loc	; destination address
+	ld	hl,xproc	; source address
+	rst	08		; do it
+;
+	; Do an inter-bank call to the test procedure
+	di			; interrupts off
+	ld	a,xproc_bnk	; target bank
+	ld	ix,xproc_loc	; target address
+	call	HB_BNKCALL	; do it and pray
+	ei			; interrupts back on
+;
+	call	crlf2
+	ld	de,msgdone	; message to print
+	call	prtstr		; do it
+;
+	ret			; all done
+;
+; Test procedure to be copied into an alternate bank.  Code should
+; be entirely relocatable.
+;
+xproc_bnk	.equ	$80	; alternate bank for test proc
+xproc_loc	.equ	$1000	; run location for test proc
+;
+xproc:
+	call	crlf2
+	ld	de,msgxcal
+	call	prtstr
+	ret
+;
+xproc_end	.equ	$
+xproc_len	.equ	xproc_end - xproc
+;
+; Identify active BIOS.  RomWBW HBIOS=1, UNA UBIOS=2, else 0
+;
+idbio:
+;
+	; Check for UNA (UBIOS)
+	ld	a,($FFFD)	; fixed location of UNA API vector
+	cp	$C3		; jp instruction?
+	jr	nz,idbio1	; 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,idbio1	; 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,idbio1	; if not, not UNA, check others
+;
+	ld	bc,$04FA	; UNA: get BIOS date and version
+	rst	08		; DE := ver, HL := date
+;
+	ld	a,2		; UNA BIOS id = 2
+	ret			; and done
+;
+idbio1:
+	; Check for RomWBW (HBIOS)
+	ld	hl,(HB_IDENT)	; HL := HBIOS ident location
+	ld	a,'W'		; First byte of ident
+	cp	(hl)		; Compare
+	jr	nz,idbio2	; Not HBIOS
+	inc	hl		; Next byte of ident
+	ld	a,~'W'		; Second byte of ident
+	cp	(hl)		; Compare
+	jr	nz,idbio2	; Not HBIOS
+;
+	ld	b,BF_SYSVER	; HBIOS: VER function
+	ld	c,0		; required reserved value
+	rst	08		; DE := version, L := platform id
+;	
+	ld	a,1		; HBIOS BIOS id = 1
+	ret			; and done
+;
+idbio2:
+	; No idea what this is
+	xor	a		; Setup return value of 0
+	ret			; and done
+;
+; 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	b,BF_CIOOUT	; HBIOS function to output a character
+	ld	c,CIO_CONSOLE	; write to current console unit
+	call	HB_INVOKE	; invoke HBIOS via call
+	pop	hl		; restore registers
+	pop	de
+	pop	bc
+	ret
+;
+prtdot:
+;
+	; shortcut to print a dot preserving all regs
+	push	af		; save af
+	ld	a,'.'		; load dot char
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+prtspace:
+;
+	; shortcut to print a space preserving all regs
+	push	af		; save af
+	ld	a,' '		; load dot char
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+prtcr:
+;
+	; shortcut to print a dot preserving all regs
+	push	af		; save af
+	ld	a,13		; load CR value
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+; 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	
+;
+; Print a block of memory nicely formatted
+;  de=buffer address
+;
+dump_buffer:
+	call	crlf
+
+	push	de
+	pop	hl
+	inc	d
+	inc	d
+
+db_blkrd:
+	push	bc
+	push	hl
+	pop	bc
+	call	prthexword		; print start location
+	pop	bc
+	call	prtspace		;
+	ld	c,16			; set for 16 locs
+	push	hl			; save starting hl
+db_nxtone:
+	ld	a,(hl)			; get byte
+	call	prthex			; print it
+	call	prtspace		;
+db_updh:
+	inc	hl			; point next
+	dec	c			; dec. loc count
+	jr	nz,db_nxtone		; if line not done
+					; now print 'decoded' data to right of dump
+db_pcrlf:
+	call	prtspace		; space it
+	ld	c,16			; set for 16 chars
+	pop	hl			; get back start
+db_pcrlf0:
+	ld	a,(hl)			; get byte
+	and	060h			; see if a 'dot'
+	ld	a,(hl)			; o.k. to get
+	jr	nz,db_pdot		;
+db_dot:
+	ld	a,2eh			; load a dot
+db_pdot:
+	call	prtchr			; print it
+	inc	hl			;
+	ld	a,d			;
+	cp	h			;
+	jr	nz,db_updh1		;
+	ld	a,e			;
+	cp	l			;
+	jp	z,db_end		;
+db_updh1:
+; if block not dumped, do next character or line
+	dec	c			; dec. char count
+	jr	nz,db_pcrlf0		; do next
+db_contd:
+	call	crlf			;
+	jp	db_blkrd		;
+
+db_end:
+	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 bc
+;
+prthexword:
+	push	af
+	ld	a,b
+	call	prthex
+	ld	a,c
+	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
+;
+; Print value of A or HL in decimal with leading zero suppression
+; Use prtdecb for A or prtdecw for HL
+;
+prtdecb:
+	push	hl
+	ld	h,0
+	ld	l,a
+	call	prtdecw		; print it
+	pop	hl
+	ret
+;
+prtdecw:
+	push	af
+	push	bc
+	push	de
+	push	hl
+	call	prtdec0
+	pop	hl
+	pop	de
+	pop	bc
+	pop	af
+	ret
+;
+prtdec0:
+	ld	e,'0'
+	ld	bc,-10000
+	call	prtdec1
+	ld	bc,-1000
+	call	prtdec1
+	ld	bc,-100
+	call	prtdec1
+	ld	c,-10
+	call	prtdec1
+	ld	e,0
+	ld	c,-1
+prtdec1:
+	ld	a,'0' - 1
+prtdec2:
+	inc	a
+	add	hl,bc
+	jr	c,prtdec2
+	sbc	hl,bc
+	cp	e
+	ret	z
+	ld	e,0
+	call	prtchr
+	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
+;
+; Get the next non-blank character from (HL).
+;
+nonblank:
+	ld	a,(hl)		; 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	hl		; if blank, increment character pointer
+	jr	nonblank	; and loop
+;
+; Convert character in A to uppercase
+;
+ucase:
+	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
+;
+; Add the value in A to HL (HL := HL + A)
+;
+addhl:
+	add	a,l		; A := A + L
+	ld	l,a		; Put result back in L
+	ret	nc		; if no carry, we are done
+	inc	h		; if carry, increment H
+	ret			; and return
+;
+; Jump indirect to address in HL
+;
+jphl:
+	jp	(hl)
+;
+; Errors
+;
+erruse:	; command usage error (syntax)
+	ld	de,msguse
+	jr	err
+;
+errprm:	; command parameter error (syntax)
+	ld	de,msgprm
+	jr	err
+;
+errbio:	; invalid BIOS or version
+	ld	de,msgbio
+	jr	err
+;
+err:	; print error string and return error signal
+	call	crlf2		; print newline
+;
+err1:	; without the leading crlf
+	call	prtstr		; print error string
+;
+err2:	; without the string
+;	call	crlf		; print newline
+	or	$FF		; signal error
+	ret			; done
+;
+;===============================================================================
+; Storage Section
+;===============================================================================
+;
+orgbnk	.db	0		; original bank id at startup
+;
+stksav	.dw	0		; stack pointer saved at start
+	.fill	stksiz,0	; stack
+stack	.equ	$		; stack top
+;
+; Messages
+;
+msgban	.db	"BANKTEST v1.0, 22-Jan-2023",13,10
+	.db	"Copyright (C) 2023, Wayne Warthen, GNU GPL v3",0
+msguse	.db	"Usage: BANKTEST",13,10
+msgprm	.db	"Parameter error (BANKTEST /? for usage)",0
+msgbio	.db	"Incompatible BIOS or version, "
+	.db	"HBIOS v", '0' + rmj, ".", '0' + rmn, " required",0
+msgcur	.db	"Initial Bank ID = 0x",0
+msg80	.db	"Hello from bank 0x80!",0
+msgxcal	.db	"Inter-bank procedure call test...",0
+msgdone	.db	"End of bank test",0
+;
+;
+;
+size	.equ	$ - runloc
+;
+	.end

Source/Apps/Test/piomon/Build.cmd

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

Source/Apps/Test/piomon/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/piomon/Makefile

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

Source/Apps/Test/piomon/Readme.txt

@@ -0,0 +1,36 @@
+PIOMON is a program to verify operation of the Z80 MBC DUALPIO board
+
+Most testing requires the use of loopback hardware constructed as:
+
+Channel A   RDY STB  D0  D1  D2  D3  D4  D5  D6  D7
+             \   /   |   |   |   |   |   |   |   |
+              \ /    |   |   |   |   |   |   |   |
+               X     |   |   |   |   |   |   |   |
+              / \    |   |   |   |   |   |   |   |
+             /   \   |   |   |   |   |   |   |   |
+Channel B   RDY STB  D0  D1  D2  D3  D4  D5  D6  D7
+
+The DUALPIO has, well, 2 PIO chips.  Only one chip
+is tested at a time.  At startup, PIOMON will ask
+you for the port of the chip to test.  It defaults
+to the standard port number for the primary PIO chip
+on an MBC DUALPIO board.
+
+The port number specified is the base I/O port.  Each
+chip has two channels which are addressed in the
+menu by specifying A or B.
+
+MBC DUALPIO Primary PIO = 0xB8
+MBC DUALPIO Secondary PIO = 0xBC
+
+If you try to use PIOMON without the RDY and STB
+cross connected, you may have interrupt issues
+because STB will be floating.
+
+N.B., V1 and V2 of the DUALPIO lack a hardware reset.  The
+PIO chips will reset at power-on, but they do not reset
+when the reset button is pushed.
+
+Happy St. Patrick's Day!!!
+
+--WBW 7:42 PM 3/17/2022

Source/Apps/Test/portscan/Build.cmd

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

Source/Apps/Test/portscan/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/portscan/Makefile

@@ -0,0 +1,9 @@
+OBJECTS = portscan.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
+
+TASM=$(BINDIR)/uz80as -t hd64180

Source/Apps/Test/portscan/portscan.asm

@@ -0,0 +1,602 @@
+;===============================================================================
+; PORTSCAN - Sweep Ports
+;
+;===============================================================================
+;
+;	Author:  Wayne Warthen (wwarthen@gmail.com)
+;_______________________________________________________________________________
+;
+; Usage:
+;   PORTSCAN
+;
+; Operation:
+;   Reads all ports (multiple ways) and displays values read
+;_______________________________________________________________________________
+;
+; Change Log:
+;   2023-02-14 [WBW] Initial release
+;_______________________________________________________________________________
+;
+; ToDo:
+;_______________________________________________________________________________
+;
+;===============================================================================
+; Definitions
+;===============================================================================
+;
+runloc	.equ	$C000		; Running location (upper memory required)
+stksiz	.equ	$40		; Working stack size
+;
+restart	.equ	$0000		; CP/M restart vector
+;
+;
+#include "../../../ver.inc"
+;
+#include "../../../HBIOS/hbios.inc"
+;
+;===============================================================================
+; Code Section
+;===============================================================================
+;
+	.org	$100
+;
+	; relocate worker code to upper memory
+	ld	hl,begin	; start of working code image
+	ld	de,runloc	; running location
+	ld	bc,size		; size of working code image
+	ldir			; copy to upper RAM
+	jp	runloc		; and go
+;
+; Start of working code
+;
+begin	.equ	$		; image loaded here
+;
+	.org	runloc		; now generate running location adresses
+;
+	; setup stack (save old value)
+	ld	(stksav),sp	; save stack
+	ld	sp,stack	; set new stack
+;
+	; initialization
+	call	init		; initialize
+	jr	nz,exit		; abort if init fails
+;
+	; process
+	call 	process		; do main processing
+	jr	nz,exit		; abort on error
+;
+exit:	; clean up and return to command processor
+	call	crlf		; formatting
+	ld	sp,(stksav)	; restore stack
+	;jp	restart		; return to CP/M via restart
+	ret			; return to CP/M w/o restart
+;
+; Initialization
+;
+init:
+	call	crlf2		; formatting
+	ld	de,msgban	; point to version message part 1
+	call	prtstr		; print it
+;
+	call	idbio		; identify active BIOS
+	cp	1		; check for HBIOS
+	jp	nz,errbio	; handle BIOS error
+;
+	ld	a,rmj << 4 | rmn	; expected HBIOS ver
+	cp	d		; compare with result above
+	jp	nz,errbio	; handle BIOS error
+;
+initx
+	; initialization complete
+	xor	a		; signal success
+	ret			; return
+;
+; Process
+;
+process:
+	call	crlf
+	ld	a,($FFE0)	; get current hbios bank id
+	ld	(orgbnk),a	; and save it
+	ld	a,0		; start with port 0
+	ld	(curport),a	; save it for use below
+	; Test for z180 using mlt
+	ld	de,$0506	; 5 x 6
+	mlt	de		; de = 30 if z180
+	ld	a,e		; result to A
+	cp	30		; check if multiply happened
+	jr	nz,prtcpu		; if invalid, then Z80
+	or	$FF		; flag value for Z180
+	ld	(is180),a	; save it
+;
+prtcpu:
+	ld	de,msgcpu
+	call	prtstr
+	ld	a,(is180)
+	or	a
+	ld	de,msgz80
+	jr	z,prtcpu1
+	ld	de,msgz180
+prtcpu1:
+	call	prtstr
+	call	crlf
+;
+loop:
+	call	crlf
+	ld	a,(curport)
+	call	prthex
+	ld	a,':'
+	call	prtchr
+;
+	di			; interrupts off
+;
+	ld	hl,vallist	; init value list pointer
+	call	portread	; read the port
+	call	portread	; do it again
+;
+	; restore possibly corrupted bank registers
+	ld	a,(orgbnk)	; get proper bank id
+	call	$FFF3		; restore it
+;
+	ei			; interrupts safe now
+;
+	ld	hl,vallist	; re-init value list pointer
+	ld	b,4		; print 4 values
+prtloop:
+	ld	a,' '
+	call	prtchr
+	ld	a,(hl)
+	call	prthex
+	inc	hl
+	djnz	prtloop
+;
+	; update port and loop as needed
+	ld	a,(curport)	; get current port
+	inc	a		; move to next
+	ld	(curport),a	; save it
+	jr	z,done		; done on wraparound
+	jr	loop		; loop until done
+;
+done:
+;
+	call	crlf2
+	ld	de,msgdone	; message to print
+	call	prtstr		; do it
+	ret			; all done
+;
+;
+;
+portread:
+	ld	a,(is180)
+	or	a
+	jr	nz,portread_z180
+;
+portread_z80:	; use traditional "IN"
+	; read port using IN <portnum>
+	ld	a,(curport)	; get current port
+	ld	(pnum0),a	; modify IN instruction
+	nop			; defeat Z280 pipeline
+	nop
+	in	a,($FF)		; read the port
+pnum0	.equ	$-1
+	ld	(hl),a		; save it
+	inc	hl		; bump value list pointer
+	jr	portread1
+;
+portread_z180:	; use "IN0"
+	; read port using IN <portnum>
+	ld	a,(curport)	; get current port
+	ld	(pnum1),a	; modify IN instruction
+	in0	a,($FF)		; read the port
+pnum1	.equ	$-1
+	ld	(hl),a		; save it
+	inc	hl		; bump value list pointer
+;
+portread1:
+	; read port using IN (C)
+	ld	a,(curport)	; get current port
+	ld	b,0		; in case 16 bits decoded
+	ld	c,a		; move to reg C
+	in	a,(c)		; read the port
+	ld	(hl),a		; save it
+	inc	hl		; bump value list pointer
+	ret
+;
+; Identify active BIOS.  RomWBW HBIOS=1, UNA UBIOS=2, else 0
+;
+idbio:
+;
+	; Check for UNA (UBIOS)
+	ld	a,($FFFD)	; fixed location of UNA API vector
+	cp	$C3		; jp instruction?
+	jr	nz,idbio1	; 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,idbio1	; 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,idbio1	; if not, not UNA, check others
+;
+	ld	bc,$04FA	; UNA: get BIOS date and version
+	rst	08		; DE := ver, HL := date
+;
+	ld	a,2		; UNA BIOS id = 2
+	ret			; and done
+;
+idbio1:
+	; Check for RomWBW (HBIOS)
+	ld	hl,(HB_IDENT)	; HL := HBIOS ident location
+	ld	a,'W'		; First byte of ident
+	cp	(hl)		; Compare
+	jr	nz,idbio2	; Not HBIOS
+	inc	hl		; Next byte of ident
+	ld	a,~'W'		; Second byte of ident
+	cp	(hl)		; Compare
+	jr	nz,idbio2	; Not HBIOS
+;
+	ld	b,BF_SYSVER	; HBIOS: VER function
+	ld	c,0		; required reserved value
+	rst	08		; DE := version, L := platform id
+;	
+	ld	a,1		; HBIOS BIOS id = 1
+	ret			; and done
+;
+idbio2:
+	; No idea what this is
+	xor	a		; Setup return value of 0
+	ret			; and done
+;
+; 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	b,BF_CIOOUT	; HBIOS function to output a character
+	ld	c,CIO_CONSOLE	; write to current console unit
+	call	HB_INVOKE	; invoke HBIOS via call
+	pop	hl		; restore registers
+	pop	de
+	pop	bc
+	ret
+;
+prtdot:
+;
+	; shortcut to print a dot preserving all regs
+	push	af		; save af
+	ld	a,'.'		; load dot char
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+prtspace:
+;
+	; shortcut to print a space preserving all regs
+	push	af		; save af
+	ld	a,' '		; load dot char
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+prtcr:
+;
+	; shortcut to print a dot preserving all regs
+	push	af		; save af
+	ld	a,13		; load CR value
+	call	prtchr		; print it
+	pop	af		; restore af
+	ret			; done
+;
+; 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	
+;
+; Print a block of memory nicely formatted
+;  de=buffer address
+;
+dump_buffer:
+	call	crlf
+
+	push	de
+	pop	hl
+	inc	d
+	inc	d
+
+db_blkrd:
+	push	bc
+	push	hl
+	pop	bc
+	call	prthexword		; print start location
+	pop	bc
+	call	prtspace		;
+	ld	c,16			; set for 16 locs
+	push	hl			; save starting hl
+db_nxtone:
+	ld	a,(hl)			; get byte
+	call	prthex			; print it
+	call	prtspace		;
+db_updh:
+	inc	hl			; point next
+	dec	c			; dec. loc count
+	jr	nz,db_nxtone		; if line not done
+					; now print 'decoded' data to right of dump
+db_pcrlf:
+	call	prtspace		; space it
+	ld	c,16			; set for 16 chars
+	pop	hl			; get back start
+db_pcrlf0:
+	ld	a,(hl)			; get byte
+	and	060h			; see if a 'dot'
+	ld	a,(hl)			; o.k. to get
+	jr	nz,db_pdot		;
+db_dot:
+	ld	a,2eh			; load a dot
+db_pdot:
+	call	prtchr			; print it
+	inc	hl			;
+	ld	a,d			;
+	cp	h			;
+	jr	nz,db_updh1		;
+	ld	a,e			;
+	cp	l			;
+	jp	z,db_end		;
+db_updh1:
+; if block not dumped, do next character or line
+	dec	c			; dec. char count
+	jr	nz,db_pcrlf0		; do next
+db_contd:
+	call	crlf			;
+	jp	db_blkrd		;
+
+db_end:
+	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 bc
+;
+prthexword:
+	push	af
+	ld	a,b
+	call	prthex
+	ld	a,c
+	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
+;
+; Print value of A or HL in decimal with leading zero suppression
+; Use prtdecb for A or prtdecw for HL
+;
+prtdecb:
+	push	hl
+	ld	h,0
+	ld	l,a
+	call	prtdecw		; print it
+	pop	hl
+	ret
+;
+prtdecw:
+	push	af
+	push	bc
+	push	de
+	push	hl
+	call	prtdec0
+	pop	hl
+	pop	de
+	pop	bc
+	pop	af
+	ret
+;
+prtdec0:
+	ld	e,'0'
+	ld	bc,-10000
+	call	prtdec1
+	ld	bc,-1000
+	call	prtdec1
+	ld	bc,-100
+	call	prtdec1
+	ld	c,-10
+	call	prtdec1
+	ld	e,0
+	ld	c,-1
+prtdec1:
+	ld	a,'0' - 1
+prtdec2:
+	inc	a
+	add	hl,bc
+	jr	c,prtdec2
+	sbc	hl,bc
+	cp	e
+	ret	z
+	ld	e,0
+	call	prtchr
+	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
+;
+; Get the next non-blank character from (HL).
+;
+nonblank:
+	ld	a,(hl)		; 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	hl		; if blank, increment character pointer
+	jr	nonblank	; and loop
+;
+; Convert character in A to uppercase
+;
+ucase:
+	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
+;
+; Add the value in A to HL (HL := HL + A)
+;
+addhl:
+	add	a,l		; A := A + L
+	ld	l,a		; Put result back in L
+	ret	nc		; if no carry, we are done
+	inc	h		; if carry, increment H
+	ret			; and return
+;
+; Jump indirect to address in HL
+;
+jphl:
+	jp	(hl)
+;
+; Short delay functions.  No clock speed compensation, so they
+; will run longer on slower systems.  The number indicates the
+; number of call/ret invocations.  a single call/ret is
+; 27 t-states on a z80, 25 t-states on a z180
+;
+;			; Z80	Z180
+;			; ----	----
+dly64:	call	dly32	; 1728	1600
+dly32:	call	dly16	; 864	800
+dly16:	call	dly8	; 432	400
+dly8:	call	dly4	; 216	200
+dly4:	call	dly2	; 108	100
+dly2:	call	dly1	; 54	50
+dly1:	ret		; 27	25
+
+;
+; Errors
+;
+erruse:	; command usage error (syntax)
+	ld	de,msguse
+	jr	err
+;
+errprm:	; command parameter error (syntax)
+	ld	de,msgprm
+	jr	err
+;
+errbio:	; invalid BIOS or version
+	ld	de,msgbio
+	jr	err
+;
+err:	; print error string and return error signal
+	call	crlf2		; print newline
+;
+err1:	; without the leading crlf
+	call	prtstr		; print error string
+;
+err2:	; without the string
+;	call	crlf		; print newline
+	or	$FF		; signal error
+	ret			; done
+;
+;===============================================================================
+; Storage Section
+;===============================================================================
+;
+is180	.db	0		; non-zero for z180
+orgbnk	.db	0		; original bank id
+curport	.db	0		; current port being processed
+vallist .fill	8,0		; port values read
+;
+stksav	.dw	0		; stack pointer saved at start
+	.fill	stksiz,0	; stack
+stack	.equ	$		; stack top
+;
+; Messages
+;
+msgban	.db	"PORTSCAN v1.0, 16-Feb-2023",13,10
+	.db	"Copyright (C) 2023, Wayne Warthen, GNU GPL v3",0
+msguse	.db	"Usage: PORTSCAN",13,10
+msgprm	.db	"Parameter error (PORTSCAN /? for usage)",0
+msgbio	.db	"Incompatible BIOS or version, "
+	.db	"HBIOS v", '0' + rmj, ".", '0' + rmn, " required",0
+str_sep	.db	": ",0
+;
+msgcpu	.db	"CPU is ",0
+msgz80	.db	"Z80",0
+msgz180	.db	"Z180",0
+msgdone	.db	"End of Port Sweep",0
+
+;
+;
+;
+size	.equ	$ - runloc
+;
+	.end

Source/Apps/Test/ps2info/ps2info.asm

@@ -6,12 +6,21 @@
 ; Simple utility that performs simple tests of an 8242 PS/2 controller,
 ; keyboard, and mouse.
 ;
+; WBW 2022-03-28: Add menu driven port selection
+;                 Add support for RHYOPHYRE
+; WBW 2022-04-01: Add menu for test functions
+; WBW 2022-04-02: Fix prtchr register saving/recovery
+;
 ;=======================================================================
 ;
 ; PS/2 Keyboard/Mouse controller port addresses (adjust as needed)
 ;
-iocmd	.equ	$E3	; PS/2 controller command port address
-iodat	.equ	$E2	; PS/2 controller data port address
+; MBC:
+iocmd_mbc	.equ	$E3	; PS/2 controller command port address
+iodat_mbc	.equ	$E2	; PS/2 controller data port address
+; RPH:
+iocmd_rph	.equ	$8D	; PS/2 controller command port address
+iodat_rph	.equ	$8C	; PS/2 controller data port address
 ;
 cpumhz	.equ	8	; for time delay calculations (not critical)
 ;
@@ -37,6 +46,8 @@ bdos	.equ	$0005			; BDOS invocation vector
 	call	crlf
 	ld	de,str_banner		; banner
 	call	prtstr
+;
+	call	setup
 ;
 	call	main			; do the real work
 ;
@@ -50,52 +61,95 @@ exit:
 	ld	sp,(stksav)		; restore stack
 	jp	restart			; return to CP/M via restart
 ;
+;=======================================================================
+; Select and setup for hardware
+;=======================================================================
+;
+setup:
+	call	crlf2
+	ld	de,str_hwmenu
+	call	prtstr
+setup1:
+	ld	c,$06			; BDOS direct console I/O
+	ld	e,$FF			; Subfunction = read
+	call	bdos
+	cp	0
+	jr	z,setup1
+	call	upcase
+	call	prtchr
+	cp	'1'			; MBC
+	jr	z,setup_mbc
+	cp	'2'			; RHYOPHYRE
+	jr	z,setup_rph
+	cp	'X'
+	jr	z,exit
+	jr	setup
+;
+setup_mbc:
+	ld	a,iocmd_mbc
+	ld	(iocmd),a
+	ld	a,iodat_mbc
+	ld	(iodat),a
+	ld	de,str_mbc
+	jr	setup2
+;
+setup_rph:
+	ld	a,iocmd_rph
+	ld	(iocmd),a
+	ld	a,iodat_rph
+	ld	(iodat),a
+	ld	de,str_rph
+	jr	setup2
+;
+setup2:
+	call	prtstr
+	call	crlf2
+	ld	de,str_cmdport
+	call	prtstr
+	;ld	a,iocmd
+	ld	a,(iocmd)
+	call	prthex
+	call	crlf
+	ld	de,str_dataport
+	call	prtstr
+	;ld	a,iodat
+	ld	a,(iodat)
+	call	prthex
+;
+	xor	a
+	ret
 ;
 ;=======================================================================
 ; Main Program
 ;=======================================================================
 ;
 main:
-;
-; Display active controller port addresses
-;
 	call	crlf2
-	ld	de,str_cmdport
+	ld	de,str_menu
 	call	prtstr
-	ld	a,iocmd
-	call	prthex
-	call	crlf
-	ld	de,str_dataport
-	call	prtstr
-	ld	a,iodat
-	call	prthex
-;
-	call	test_ctlr
-	jr	z,main0			; continue if ctlr OK
-	ld	de,str_kbd_failed
-	call	crlf2
-	call	prtstr
-	jr	mainz			; bail out if ctlr fails
-;
-main0:
-	call	test_kbd
-	jr	z,main1			; completed all tests, continue
-	ld	de,str_kbd_failed
-	call	crlf2
-	call	prtstr
-;
 main1:
-	call	test_mse
-	jr	z,main2			; completed all tests, continue
-	ld	de,str_mse_failed
-	call	crlf2
-	call	prtstr
+	ld	c,$06			; BDOS direct console I/O
+	ld	e,$FF			; Subfunction = read
+	call	bdos
+	cp	0
+	jr	z,main1
+	call	upcase
+	call	prtchr
+	cp	'X'
+	jp	z,exit
+	call	main2
+	jr	main
 ;
 main2:
-	call	test_kbdmse
-;
-mainz:
-	xor	a
+	; Dispatch to test functions
+	cp	'C'			; Test Controller
+	jp	z,test_ctlr
+	cp	'K'			; Test Keyboard
+	jp	z,test_kbd
+	cp	'M'			; Test Mouse
+	jp	z,test_mse
+	cp	'B'			; Test Both
+	jp	z,test_kbdmse
 	ret
 ;
 ; Test 8242 PS/2 Controller
@@ -109,10 +163,8 @@ test_ctlr:
 	ret	nz
 ;
 	call	ctlr_test_p1
-	;ret	nz
 ;
 	call	ctlr_test_p2
-	;ret	nz
 ;
 	ret
 ;
@@ -123,13 +175,15 @@ test_kbd:
 ; First, we attempt to contact the controller and keyboard, then
 ; print the keyboard identity and scan codes supported
 ;
-	; Run test series with translation off
 	call	crlf2
 	ld	de,str_basic
 	call	prtstr
+;
+	call	ctlr_test
+	jr	nz,test_kbd_fail
 ;
 	call	test_kbd_basic
-	ret	nz
+	jr	nz,test_kbd_fail
 ;
 ; We make two passes through the test series with different controller
 ; setup values.  The first time is with scan code translation off and
@@ -155,59 +209,83 @@ test_kbd:
 ;
 	ret
 ;
+test_kbd_fail:
+	ld	de,str_kbd_failed
+	call	crlf2
+	call	prtstr
+	ret
+;
 ; Test Mouse
 ;
 test_mse:
 	call	crlf2
 	ld	de,str_basic_mse
 	call	prtstr
+;
+	call	ctlr_test
+	jr	nz,test_mse_fail
 ;
 	ld	a,$10			; kbd disabled, mse enabled, no ints
 	call	ctlr_setup
-	ret	nz
+	jr	nz,test_mse_fail
 ;
 	call	mse_reset
-	ret	nz
+	jr	nz,test_mse_fail
 ;
 	call	mse_ident
-	ret	nz
+	jr	nz,test_mse_fail
 ;
 	call	mse_stream
-	ret	nz
+	jr	nz,test_mse_fail
 ;
 	call	mse_echo
 ;	
 	xor	a			; signal success
 	ret
 ;
+test_mse_fail:
+	ld	de,str_mse_failed
+	call	crlf2
+	call	prtstr
+	ret
+;
 ; Test Everything
 ;
 test_kbdmse:
 	call	crlf2
 	ld	de,str_kbdmse
 	call	prtstr
+;
+	call	ctlr_test
+	jr	nz,test_kbdmse_fail
 ;
 	ld	a,$00			; kbd enabled, mse enabled, no ints
 	call	ctlr_setup
-	ret	nz
+	jr	nz,test_kbdmse_fail
 ;
 	call	kbd_reset
-	ret	nz
+	jr	nz,test_kbdmse_fail
 ;
 	ld	a,2
 	call	kbd_setsc
 ;
 	call	mse_reset
-	ret	nz
+	jr	nz,test_kbdmse_fail
 ;
 	call	mse_stream
-	ret	nz
+	jr	nz,test_kbdmse_fail
 ;
 	call	kbdmse_echo
 ;	
 	xor	a			; signal success
 	ret
 ;
+test_kbdmse_fail:
+	ld	de,str_kbdmse_failed
+	call	crlf2
+	call	prtstr
+	ret
+;
 ; Perform basic keyboard tests, display keyboard identity, and
 ; inventory the supported scan code sets.
 ;
@@ -782,7 +860,9 @@ wait_write:
 	ld	a,(timeout)		; setup timeout constant
 	ld	b,a
 wait_write1:
-	in	a,(iocmd)		; get status
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
+	in	a,(c)			; get status
 	ld	c,a			; save status
 	and	$02			; isolate input buf status bit
 	ret	z			; 0 means ready, all done
@@ -804,7 +884,9 @@ wait_read:
 	ld	a,(timeout)		; setup timeout constant
 	ld	b,a
 wait_read1:
-	in	a,(iocmd)		; get status
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
+	in	a,(c)			; get status
 	ld	c,a			; save status
 	and	$01			; isolate input buf status bit
 	xor	$01			; invert so 0 means ready
@@ -824,7 +906,9 @@ check_read:
 ; Check for data ready to read
 ;   A=0 indicates data available (ZF set)
 ;
-	in	a,(iocmd)		; get status
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
+	in	a,(c)			; get status
 	and	$01			; isolate input buf status bit
 	xor	$01			; invert so 0 means ready
 	ret
@@ -834,7 +918,9 @@ check_read_kbd:
 ; Check for keyboard data ready to read
 ;   A=0 indicates data available (ZF set)
 ;
-	in	a,(iocmd)		; get status
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
+	in	a,(c)			; get status
 	and	%00100001		; isolate input buf status bit
 	cp	%00000001		; data ready, not mouse
 	ret
@@ -844,7 +930,9 @@ check_read_mse:
 ; Check for mouse data ready to read
 ;   A=0 indicates data available (ZF set)
 ;
-	in	a,(iocmd)		; get status
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
+	in	a,(c)			; get status
 	and	%00100001		; isolate input buf status bit
 	cp	%00100001		; data ready, is mouse
 	ret
@@ -860,8 +948,10 @@ put_cmd:
 	scf				; else, signal timeout error
 	ret				; and bail out
 put_cmd1:
+	ld	a,(iocmd)		; cmd port
+	ld	c,a			; ... to C
 	ld	a,e			; recover value to write
-	out	(iocmd),a		; write it
+	out	(c),a			; write it
 	or	a			; clear CF for success
 	ret
 ;
@@ -889,8 +979,10 @@ put_data:
 	scf				; else, signal timeout error
 	ret				; and bail out
 put_data1:
+	ld	a,(iodat)		; data port
+	ld	c,a			; ... to C
 	ld	a,e			; recover value to write
-	out	(iodat),a		; write it
+	out	(c),a			; write it
 	or	a			; clear CF for success
 	ret
 ;
@@ -947,7 +1039,9 @@ get_data:
 	scf				; else signal timeout error
 	ret				; and bail out
 get_data1:
-	in	a,(iodat)		; get data byte
+	ld	a,(iodat)		; data port
+	ld	c,a			; ... to C
+	in	a,(c)			; get data byte
 	or	a			; clear CF for success
 	ret
 ;
@@ -1020,11 +1114,11 @@ err_ret:
 ; Utility Routines
 ;=======================================================================
 ;
-;
 ; Print character in A without destroying any registers
 ;
 prtchr:
-	push	bc		; save registers
+	push	af		; save registers
+	push	bc
 	push	de
 	push	hl
 	ld	e,a		; character to print in E
@@ -1033,6 +1127,7 @@ prtchr:
 	pop	hl		; restore registers
 	pop	de
 	pop	bc
+	pop	af
 	ret
 ;
 prtdot:
@@ -1044,6 +1139,16 @@ prtdot:
 	pop	af		; restore af
 	ret			; done
 ;
+; Uppercase character in A
+;
+upcase:
+	cp	'a'			; below 'a'?
+	ret	c			; if so, nothing to do
+	cp	'z'+1			; above 'z'?
+	ret	nc			; if so, nothing to do
+	and	~$20			; convert character to lower
+	ret				; done
+;
 ; Print a zero terminated string at (de) without destroying any registers
 ;
 prtstr:
@@ -1239,7 +1344,21 @@ delay1:
 ; Constants
 ;=======================================================================
 ;
-str_banner		.db	"PS/2 Keyboard/Mouse Information v0.4, 7-Jan-2022",0
+str_banner		.db	"PS/2 Keyboard/Mouse Information v0.6a, 2-Apr-2022",0
+str_hwmenu		.db	"PS/2 Controller Port Options:\r\n\r\n"
+			.db	"  1 - MBC\r\n"
+			.db	"  2 - RHYOPHYRE\r\n"
+			.db	"  X - Exit Application\r\n"
+			.db	"\r\nSelection? ",0
+str_mbc			.db	"MBC",0
+str_rph			.db	"RHYOPHYRE",0
+str_menu		.db	"PS/2 Testing Options:\r\n\r\n"
+			.db	"  C - Test PS/2 Controller\r\n"
+			.db	"  K - Test PS/2 Keyboard\r\n"
+			.db	"  M - Test PS/2 Mouse\r\n"
+			.db	"  B - Test Both PS/2 Keyboard and Mouse Together\r\n"
+			.db	"  X - Exit Application\r\n"
+			.db	"\r\nSelection? ",0
 str_exit		.db	"Done, Thank you for using PS/2 Keyboard/Mouse Information!",0
 str_cmdport		.db	"Controller Command Port: ",0
 str_dataport		.db	"Controller Data Port: ",0
@@ -1312,6 +1431,11 @@ str_mse_failed		.db	"***** MOUSE HARDWARE ERROR *****",13,10,13,10
 			.db	"the completion of the full set of mouse tests.",13,10
 			.db	"Check your hardware and verify the port",13,10
 			.db	"addresses being used for the controller",0
+str_kbdmse_failed	.db	"***** KEYBOARD/MOUSE HARDWARE ERROR *****",13,10,13,10
+			.db	"A basic hardware or configuration issue prevented",13,10
+			.db	"the completion of the full set of keyboard/mouse tests.",13,10
+			.db	"Check your hardware and verify the port",13,10
+			.db	"addresses being used for the controller",0
 ;
 ;=======================================================================
 ; Working data
@@ -1321,6 +1445,9 @@ stksav		.dw	0		; stack pointer saved at start
 		.fill	stksiz,0	; stack
 stack		.equ	$		; stack top
 ;
+iocmd		.db	0
+iodat		.db	0
+;
 workbuf		.fill	8
 workbuf_len	.db	0
 ;

Source/Apps/Test/rzsz/rz.asm

@@ -327,9 +327,9 @@ bdos_s:		call	bdos
 		ret
 
 ;----------------------------------------------------------------------------
-;		S u b r	o u t i	n e
+;		Search for 0 terminated string starting at HL
 
-sub_476:	push	af
+Search0:	push	af
 loc_477:	push	bc
 		xor	a
 		ld	b,a
@@ -361,7 +361,7 @@ text495h:	.db	0,0,0
 
 sub_4A4:	ld	de,file_fcb
 		ld	hl,byte_4F8
-		ld	(hl),3Ah
+		ld	(hl),':'
 		inc	hl
 		xor	a
 		ld	b,0Dh
@@ -370,14 +370,14 @@ sub_4A4:	ld	de,file_fcb
 		call	sub_16C4
 		dec	de
 		ld	a,(de)
-		add	a,40h
+		add	a,'A'-1
 		ld	(byte_4F4),a
 		dec	de
 		ld	a,(de)
 		ld	de,byte_4F5
 		call	sub_16E7
-		ld	a,24h
-		ld	(byte_507),a
+		ld	a,'$'
+		ld	(term_fn),a
 		ld	de,text4F2h
 		ld	c,C_WRITESTR
 		call	bdos		; Output string
@@ -386,13 +386,13 @@ sub_4A4:	ld	de,file_fcb
 		or	l
 		ret	z
 		ld	b,1
-		call	sub_476
+		call	Search0
 		dec	hl
-		ld	(hl),24h
+		ld	(hl),'$'
 		ld	de,(byte_2CD4)
 		ld	c,C_WRITESTR
 		call	bdos		; Output string
-		ld	de,text508h
+		ld	de,newline
 		ld	c,C_WRITESTR
 		jp	bdos		; Output string
 
@@ -418,8 +418,8 @@ byte_4F8:	.db	0 ;
 		.db	0 ;
 		.db	0 ;
 		.db	20h ;
-byte_507:	.db	0			
-text508h:	.text	"\r\n$"
+term_fn:	.db	0			
+newline:	.text	"\r\n$"
 
 ;----------------------------------------------------------------------------
 ;		S u b r	o u t i	n e
@@ -1278,7 +1278,7 @@ loc_9AE:	ld	a,(byte_8AF)
 		ret	z
 		push	hl
 		ld	b,1
-		call	sub_476
+		call	Search0
 		dec	hl
 		ld	(hl),20h
 		pop	hl

Source/Apps/Test/sound/Scales.asm

@@ -0,0 +1,329 @@
+;
+;------------------------------------------------------------------------------
+; PLAY SCALES USING HBIOS
+;------------------------------------------------------------------------------
+;
+FCB		.EQU	$5C			; Location of default FCB
+BDOS		.EQU	$0005
+;
+		.ORG	$0100
+;
+                LD      (OLDSTACK),SP		; save old stack pointer
+                LD      SP,STACK		; set new stack pointer
+;
+;------------------------------------------------------------------------------
+; GET DEVICE # FROM COMMAND LINE
+;------------------------------------------------------------------------------
+;
+		LD	A,(FCB+1)		; GET FIRST CHAR 
+		SUB	' '
+		JR	Z,NO_ARG
+		SUB	'0'-' '
+		JP	C,EXIT
+;
+;------------------------------------------------------------------------------
+; DISPLAY DEVICE AND NUMBER OF CHANNELS
+;------------------------------------------------------------------------------
+;
+NO_ARG:		LD	(DEVICE),A		; 	
+		LD	DE,TXT_DEV		; DEVICE:
+		CALL	PRTSTR
+		CALL	PRTDECB
+		LD	C,A			; GET DEVICE ID
+		LD	A,':'
+		CALL	PRTCHR
+		LD	B,$55
+		PUSH	BC
+		LD	E,4
+		RST	08
+		LD	DE,TXT_NAME
+		LD	A,B
+		RRCA \ RRCA \ RRCA \ RRCA
+		CALL	PRTIDXDEA		; SHOW NAME
+		LD	DE,TXT_CH
+		CALL	PRTSTR
+;
+		POP	BC			; GET & DISPLAY # CHANNELS
+		LD	E,1
+		RST	08
+		LD	A,B		
+		CALL	PRTDECB
+		CALL	CRLF			; NUMBER OF CHANNELS IS IN B
+;
+;------------------------------------------------------------------------------
+; LOOP THROUGH EACH CHANNEL 
+;------------------------------------------------------------------------------
+
+CH__TONE:	LD	A,(DEVICE)	; C CONTAINS DEVICE
+		LD	C,A		; THROUGH THIS LOOP
+;
+		PUSH	BC
+		LD	B,50H		; RESET DEVICE
+		RST	08
+		POP	BC
+;
+		PUSH	BC
+		LD	B,51H		; VOLUME FULL
+		LD	L,0FFH
+		RST	08
+		POP	BC
+;
+		LD	A,B
+TST_TONE_LP:	DEC	A
+		LD	(CHANNEL),A	; SAVE CURRENT CHANNEL
+		CALL	TST_SCALES	; SCALES TEST
+;		CALL	TST_VOLUME	; VOLUME TEST
+		CALL	CRLF
+		DJNZ	TST_TONE_LP
+;
+		PUSH	BC
+		LD	B,50H		; RESET DEVICE
+		RST	08
+		POP	BC
+;
+;------------------------------------------------------------------------------
+; RESTORE STACK & EXIT
+;------------------------------------------------------------------------------
+;
+EXIT:		LD      SP, (OLDSTACK)		; Exit to CP/M
+		RST     00H
+		DI
+		HALT
+;
+;------------------------------------------------------------------------------
+; PLAY SCALES FROM HIGHEST HBIOS NOTE TO LOWEST
+;------------------------------------------------------------------------------
+;
+TST_SCALES:	PUSH	BC		
+		PUSH	AF
+;
+		LD	HL,380		; START NOTE
+		LD	(NOTE),HL	; Top of Octave 7 is 343
+
+		LD	B,51H		; VOLUME HIGH
+		LD	L,0FFH
+		PUSH	BC
+		RST	08
+		POP	BC
+;
+NEXT0:		PUSH	BC
+;
+		LD	DE,TXT_TSTCH	; DISPLAY CHANNEL 
+		CALL	PRTSTR
+		LD	A,(CHANNEL)
+		CALL	PRTDECB
+;
+		LD	DE,TXT_NOTE	; DISPLAY NOTE
+		CALL	PRTSTR
+		LD	HL,(NOTE)
+		CALL	PRTDECW
+		POP	BC
+;
+		LD	B,53H		; SET NOTE
+		LD	HL,(NOTE)
+		PUSH	BC
+		RST	08
+		POP	BC
+
+		OR	A		; DID DRIVER FAIL
+		JR	Z,NEXT4		; THIS NOTE ?
+
+		LD	DE,TXT_BAD_N
+		CALL	FAILMSG
+		JR	SKIP
+;
+NEXT4:		LD	B,57H		; DURATION
+		LD	HL,1000
+		PUSH	BC
+		RST	08
+		POP	BC
+
+		LD	B,54H		; PLAY
+		LD	A,(CHANNEL)
+		LD	D,A
+		PUSH	BC
+		RST	08
+		POP	BC
+;
+		OR	A		; DID DRIVER FAIL
+		JR	Z,NEXT2		; TO PLAY ?
+
+		LD	DE,TXT_BAD_N
+		CALL	FAILMSG
+		JR	SKIP
+;
+NEXT2:		CALL	DELAY
+		CALL	CRLF
+;
+SKIP:		LD	HL,(NOTE)
+		DEC	HL
+		LD	(NOTE),HL
+
+		INC	HL
+		LD	A,H
+		OR	L
+		DEC	HL
+		JR	NZ,NEXT0
+;
+		LD	B,51H		; VOLUME
+		LD	L,00H		; OFF
+		PUSH	BC
+		RST	08
+		POP	BC
+;
+		LD	B,54H		; PLAY
+		LD	A,(CHANNEL)
+		LD	D,A
+		PUSH	BC
+		RST	08
+		POP	BC
+
+		PUSH	BC
+		LD      C, 6		; check for keypress
+		LD      E,0FFH
+		CALL    BDOS
+		POP	BC
+		OR      A
+		JP	NZ,EXIT
+
+		POP	AF
+		POP	BC
+;
+		RET
+;
+FAILMSG:	PUSH	AF
+		PUSH	BC
+		CALL	PRTSTR
+		CALL	CRLF
+		POP	BC
+		POP	AF
+		RET
+;
+;------------------------------------------------------------------------------
+; CONSTANT TONE ON ALL CHANNELS, SCALE VOLUME
+;------------------------------------------------------------------------------
+;
+TST_VOLUME:
+	LD	HL,332+48		; TONE
+	LD	(NOTE),HL
+;
+	LD	B,3
+NEXTCH1	LD	A,B
+	DEC	A
+	LD	(CHANNEL),A
+	PUSH	BC		; ACROSS
+	CALL	TONE		; ALL
+
+	LD      C, 6		; KEYPRESS 
+        LD      E, 0FFH
+        CALL    BDOS
+	POP	BC		; CHANNELS
+
+        OR      A
+        JP	NZ,EXIT
+
+	DJNZ	NEXTCH1
+
+	RET
+
+TONE:	LD	A,(DEVICE)
+	LD	C,A
+
+	LD	B,50H		; RESET
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+NEXT1:	LD	B,51H		; VOLUME
+	LD	A,(VOLUME)
+	LD	L,A
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	LD	B,53H		; NOTE
+	LD	HL,(NOTE)
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	LD	B,54H		; PLAY
+	LD	A,(CHANNEL)
+	LD	D,A
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	CALL	DELAY
+;
+	LD	A,(VOLUME)
+	DEC	A
+	LD	(VOLUME),A
+	JR	NZ,NEXT1
+;
+	LD	B,51H		; VOLUME
+	LD	L,00H
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	LD	B,54H		; PLAY
+	PUSH	BC
+	LD	A,(CHANNEL)
+	LD	D,A
+	POP	BC
+	RST	08
+;
+	RET
+;;
+;------------------------------------------------------------------------------
+; LONG DELAY
+;------------------------------------------------------------------------------
+;
+DELAY:	LD	HL,-1
+DELAY1:	DEC	HL
+	LD	A,H
+	OR	L
+	JR	NZ,DELAY1
+	RET
+;
+;------------------------------------------------------------------------------
+; PRINT THE nTH STRING IN A LIST OF STRINGS WHERE EACH IS TERMINATED BY 0
+; A REGISTER DEFINES THE nTH STRING IN THE LIST TO PRINT AND DE POINTS
+; TO THE START OF THE STRING LIST.
+;------------------------------------------------------------------------------
+;
+PRTIDXDEA:	LD	C,A
+		OR	A
+PRTIDXDEA1:	JR	Z,PRTIDXDEA3		; FOUND TARGET SO EXIT 
+PRTIDXDEA2:	LD	A,(DE)			; LOOP UNIT
+		INC	DE			; WE REACH
+		OR	A			; END OF STRING
+		JR	NZ,PRTIDXDEA2
+		DEC	C			; AT STRING END. SO GO
+		JR	PRTIDXDEA1		; CHECK FOR INDEX MATCH
+PRTIDXDEA3:	CALL	PRTSTR			; DISPLAY THE STRING
+		RET
+;
+#INCLUDE "printing.inc"
+;
+TXT_CH		.DB	"CHANNELS: ",0
+TXT_TSTCH	.DB	"CHANNEL: ",0
+TXT_BAD_N	.DB	" BAD NOTE",0
+TXT_BAD_P	.DB	" PLAY ERROR",0
+TXT_NOTE	.DB	" NOTE: ",0
+TXT_DEV		.DB	"DEVICE: ",0
+TXT_NAME	.DB	"SN76489 ",0
+		.DB	"AY-3-8910 ",0
+		.DB	"I/O PORT ",0
+		.DB	"YM2612 ",0
+MODE		.DB	0		; scales mode or volume mode
+DEVICE		.DB	0
+NOTE		.DW	128
+VOLUME		.DB	0
+CHANNEL		.DB	0
+OLDSTACK        .DW     0		; original stack pointer
+                .DS     40H		; space for stack
+STACK					; top of stack
+;
+	.END

Source/Apps/Test/sound/ay-test.asm

@@ -0,0 +1,201 @@
+;*****************************************************************************
+;*****************************************************************************
+;**                                                                         **
+;**	AY-3-8910 Sound Test Program                                        **
+;**	Author: Wayne Warthen -- 10/8/2017                                  **
+;**                                                                         **
+;*****************************************************************************
+;*****************************************************************************
+;
+;=============================================================================
+; Constants Section
+;=============================================================================
+;
+; Hardware port addresses
+;
+rsel	.equ	$9A		; Register seelection port address
+rdat	.equ	$9B		; Register data port address
+acr	.equ	$9C		; Aux control register port address
+;
+; CPU speed for delay scaling
+;
+cpuspd	.equ	4		; CPU speed in MHz
+;
+; BDOS invocation constants
+;
+bdos	.equ	$0005		; BDOS invocation vector
+print	.equ	9		; BDOS print function number
+conwrt	.equ	2		; BDOS console write char
+;
+;=============================================================================
+; Code Section
+;=============================================================================
+;
+	.org	$100
+;
+	ld	(stksav),sp	; save incoming stack frame
+	ld	sp,stack	; setup our private stack
+;
+	ld	de,banner	; load banner string address
+	ld	c,print		; BDOS print function number
+	call	bdos		; do it
+;
+	ld	a,$FF		; SCG board activation value
+	out	(acr),a		; write value to ACR
+;
+	xor	a		; zero accum
+	ld	(chan),a	; init channel number
+;
+chloop:
+	; Test each channel
+	call	tstchan		; test the current channel
+	ld	hl,chan		; point to channel number
+	ld	a,(chan)	; get current channel
+	inc	a		; bump to next
+	ld	(chan),a	; save it
+	cp	3		; end of channels?
+	jr	nz,chloop	; loop if not done
+;
+	ld	de,crlf		; newline
+	ld	c,print		; BDOS print function
+	call	bdos		; do it
+;
+	ld	sp,(stksav)	; restore stack
+;
+	ret			; end of program
+;
+tstchan:
+	; Display channel being tested
+	ld	de,chmsg	; point to channel message
+	ld	c,print		; BDOS print function number
+	call	bdos		; do it
+	ld	a,(chan)	; get current channel number
+	add	a,'A'		; offset to print as alpha
+	ld	e,a		; put in E
+	ld	c,conwrt	; BDOS console out function number
+	call	bdos		; do it
+	ld	de,chmsg2	; point to channel message
+	ld	c,print		; BDOS print function number
+	call	bdos		; do it
+;
+	ld	hl,0		; initial pitch value
+	ld	(pitch),hl	; save it
+;
+	; Setup mixer register
+	ld	a,(chan)	; get channel num (0-2)
+	inc	a		; adjust index (1-3)
+	ld	b,a		; and use as loop counter
+	xor	a		; clear accum
+	scf			; set carry
+mixloop:
+	rla			; rotate bit
+	djnz	mixloop		; loop based on channel num
+	cpl			; invert bits
+	and	$FF		; so only target bit is cleared
+	push	af		; save value
+	ld	a,7		; mixer register
+	out	(rsel),a	; select it
+	pop	af		; recover value
+	out	(rdat),a	; and set register value
+;
+	; Set channel volume to max
+	ld	a,(chan)	; get channel
+	add	a,8		; adjust for start of vol regs
+	out	(rsel),a	; select register
+	ld	a,$0F		; max volume
+	out	(rdat),a	; write it
+;
+pitloop:
+	; Pitch loop
+	ld	a,(chan)	; get channel
+	sla	a		; A := channel pitch reg, 2 bytes per chan
+	out	(rsel),a	; select low byte register
+	push	af		; save register
+	ld	a,l		; get low byte of pitch value
+	out	(rdat),a	; and write it to register
+	pop	af		; recover register index
+	inc	a		; inc to high byte pitch register
+	out	(rsel),a	; select high byte register
+	ld	a,h		; get high byte of pitch value
+	out	(rdat),a	; and write it to register
+;
+	; Delay
+	ld	b,cpuspd	; cpu speed scalar
+dlyloop:
+	call	dly64		; arbitrary delay
+	djnz	dlyloop		; loop based on cpu speed
+;
+	; Next pitch value
+	ld	hl,(pitch)	; get current pitch
+	inc	hl		; increment
+	ld	(pitch),hl	; save new value
+	ld	a,h		; get high byte
+	;cp	16		; end of max range?
+	cp	4		; end of max range?
+	jr	nz,pitloop	; loop till done
+;
+	; Clean up
+	call	clrpsg		; shut down psg
+;
+	ret			; done
+;
+; Clear PSG registers to default
+;
+clrpsg:
+	ld	b,16		; loop for 18 registers
+	ld	c,0		; init register index
+clrpsg1:
+	ld	a,c		; register num to accum
+	out	(rsel),a	; select it
+	xor	a		; clear accum
+	out	(rdat),a	; and write to register
+	inc	c		; next register
+	djnz	clrpsg1		; loop through all registers
+	ret			; return
+;
+; Program PSG registers from list at HL
+;
+setpsg:
+	ld	a,(hl)		; get psg reg number
+	inc	hl		; bump index
+	cp	$FF		; check for end
+	ret	z		; return if end marker $FF
+	out	(rsel),a	; select psg register
+	ld	a,(hl)		; get register value
+	inc	hl		; bump index
+	out	(rdat),a	; set register value
+	jr	setpsg		; loop till done
+;
+; Short delay functions.  No clock speed compensation, so they
+; will run longer on slower systems.  The number indicates the
+; number of call/ret invocations.  A single call/ret is
+; 27 t-states on a z80, 25 t-states on a z180
+;
+dly256:	call	dly128
+dly128:	call	dly64
+dly64:	call	dly32
+dly32:	call	dly16
+dly16:	call	dly8
+dly8:	call	dly4
+dly4:	call	dly2
+dly2:	call	dly1
+dly1:	ret
+;
+;=============================================================================
+; Data Section
+;=============================================================================
+;
+chan	.db	0		; active audio channel
+pitch	.dw	0		; current pitch
+;
+banner	.text	"\r\nRetroBrew Computers SCG AY-3-8910 Sound Test\r\n"
+	.text	"Set SCG board base I/O address to 0x98\r\n$"
+chmsg	.text	"\r\nPlaying descending tones on channel $"
+chmsg2	.text	"...$"
+crlf	.text	"\r\n$"
+;
+stksav	.dw	0		; saved stack frame
+	.fill	80,$FF		; 40 level private stack
+stack	.equ	$		; start of stack
+;
+	.end

Source/Apps/Tune/hbios.inc

@@ -1,8 +1,5 @@
 IDENT		.EQU	$FFFE		; loc of RomWBW HBIOS ident ptr
 ;
-RMJ		.EQU	3		; intended CBIOS version - major
-RMN		.EQU	1		; intended CBIOS version - minor
-;
 BF_SYSVER	.EQU	$F1		; BIOS: VER function
 BF_SYSGET	.EQU	$F8		; HBIOS: SYSGET function
 ;

Source/Apps/Tune/printing.inc

@@ -34,6 +34,7 @@ PRTCR:
 ; Print a zero terminated string at (DE) without destroying any registers
 ;
 PRTSTR:
+	PUSH	AF
 	PUSH	DE
 ;
 PRTSTR1:
@@ -46,6 +47,7 @@ PRTSTR1:
 ;
 PRTSTR2:
 	POP	DE		; restore registers
+	POP	AF
 	RET
 ;
 ; Print the value in A in hex without destroying any registers

Source/Apps/Tune/tune.asm

@@ -44,6 +44,8 @@
 ;   2020-09-03 [E?B] Add support for Ed Brindley YM/AY Sound Card v6
 ;   2021-08-13 [WBW] Add support for LiNC Z50 Sound Card
 ;   2021-08-17 [WBW] When playing via HBIOS, call BF_SNDRESET at end
+;   2022-03-20 [DDW] Add support for MBC PSG module
+;   2023-03-30 [WBW] Fix for quark delay adjustment being trashed
 ;_______________________________________________________________________________
 ;
 ; ToDo:
@@ -54,6 +56,7 @@
 ; Main program
 ;===============================================================================
 ;
+#include	"../../ver.inc"
 #include	"hbios.inc"
 #include	"cpm.inc"
 #include	"tune.inc"
@@ -299,6 +302,11 @@ GOPT3	LD	A,0			; SETUP value to PT3 sound files
 	JR	GOPTX			; Play PTx file
 
 GOPTX
+	LD	HL,(QDLY)		; Get basic quark delay
+	OR	A			; Clear carry
+	SBC	HL,DE			; Adjust for file type
+	LD	(QDLY),HL		; Save updated quark delay factor
+
 	CALL	CRLF2
 	LD	DE, MSGSONGNAME         ; Print song name message
 	CALL	PRTSTR
@@ -320,10 +328,6 @@ GOPTX2	LD	A,(DE)
 	CALL	CRLF2			; Formatting
 	LD	DE,MSGPLY		; Playing message
 	CALL	PRTSTR			; Print message
-	LD	HL,(QDLY)		; Get basic quark delay
-	OR	A			; Clear carry
-	SBC	HL,DE			; Adjust for file type
-	LD	(QDLY),HL		; Save updated quark delay factor
 	CALL	START			; Do initialization
 PTXLP	CALL	START+5			; Play one quark
 	LD	A,(START+10)		; Get setup byte
@@ -622,6 +626,12 @@ CFGTBL:	;	PLT	RSEL	RDAT	RIN	Z180	ACR
 ;
 	.DB	$0B,	$33,	$32,	$32,	$FF,	$FF	; RCZ280 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
+;
+	.DB	13,	$A0,	$A1,	$A0,	$FF,	$A2	; MBC
+	.DW	HWSTR_MBC
+;
+	.DB	17,	$A0,	$A1,	$A0,	$FF,	$A2	; DUODYNE
+	.DW	HWSTR_DUO
 ;
 	.DB	$FF					; END OF TABLE MARKER
 ;
@@ -650,8 +660,8 @@ 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.4, 17-Aug-2021",0
-MSGUSE		.DB	"Copyright (C) 2021, Wayne Warthen, GNU GPL v3",13,10
+MSGBAN		.DB	"Tune Player for RomWBW v3.5a, 30-Mar-2023",0
+MSGUSE		.DB	"Copyright (C) 2023, 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
@@ -670,10 +680,12 @@ MSGERR		.DB	"App Error", 0
 ;
 HWSTR_SCG	.DB	"SCG ECB Board",0
 HWSTR_N8	.DB	"N8 Onboard Sound",0
-HWSTR_RCEB	.DB	"RC2014 Sound Module (EB)",0
-HWSTR_RCEB6	.DB	"RC2014 Sound Module (EBv6)",0
-HWSTR_RCMF	.DB	"RC2014 Sound Module (MF)",0
+HWSTR_RCEB	.DB	"RCBus Sound Module (EB)",0
+HWSTR_RCEB6	.DB	"RCBus Sound Module (EBv6)",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
 
 MSGUNSUP	.db	"MYM files not supported with HBIOS yet!\r\n", 0
 
@@ -2649,4 +2661,3 @@ data:
 ;
 ;===============================================================================
 	.END
-

Source/Apps/VGM/Build.cmd

@@ -6,6 +6,7 @@ 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
 
 copy /Y vgmplay.com ..\..\..\Binary\Apps\ || exit /b
-copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ || exit /b
+copy /Y Tunes\*.vgm ..\..\..\Binary\Apps\Tunes\ || exit /b

Source/Apps/VGM/Makefile

@@ -10,6 +10,9 @@ DEPS := vgmplay.asm $(shell find . -name '*.inc')
 vgmplay.com: $(DEPS)
 	$(TASM) -dWBW vgmplay.asm vgmplay.com vgmplay.lst
 
+ym2612.com: 
+	$(TASM) -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst
+
 all::
 	mkdir -p $(DEST)/Tunes
-	cp Tunes/* $(DEST)/Tunes
+	cp Tunes/*.vgm $(DEST)/Tunes