Implement System Timer for NABU

- CRTACT was not being set correctly.

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+<!--
+BEFORE YOU CREATE A PULL REQUEST:
+
+- Please base all pull requests against the master 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,16 +13,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: rlespinasse/github-slug-action@v4.4.0
-        
-      - uses: actions/checkout@v3.1.0
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - 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 distlog
           rm -rf .git*
 
       - name: List Output
@@ -33,36 +36,29 @@ jobs:
           find -type f -exec md5sum '{}' \;
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4.3.0
         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: wwarthen/actions/packages/automatic-releases@built-packages
-        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-12
+    runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v3.1.0
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - 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 distlog
           rm -rf .git*
 
       - name: List Output
@@ -72,7 +68,7 @@ jobs:
           find . -type f -exec md5 -r -- '{}' +;
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4.3.0
         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,41 +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@v4.1.1
+
       - name: Build
         run: |
+          export TZ='America/Los_Angeles'
           sudo apt-get install libncurses-dev
-          make dist
+          sudo apt-get install srecord
+          make distlog
           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,7 +20,7 @@
 
 Binary/**/*.mym
 Binary/**/*.pt3
-!Binary/cpnos-wbw.sys
+!Binary/CPNET/NetBoot/cpnos-wbw.sys
 
 Source/**/eeprom
 Source/Apps/Assign.com
@@ -85,6 +85,7 @@ Tools/unix/zx/zx
 !Source/BPBIOS/*.lib
 !Source/BPBIOS/Z34RCP11/cledinst.com
 !Source/BPBIOS/Z34RCP11/cledsave.com
+!Source/CPNET/**
 !Source/Fonts/*
 !Source/Images/**
 !Source/RomDsk/**
@@ -95,8 +96,9 @@ Tools/unix/zx/zx
 !Source/ZPM3/*.[Cc][Oo][Mm]
 !Source/ZSDOS/*.[Cc][Oo][Mm]
 !Source/ZRC/*.bin
-!Source/ZZRC/*.bin
-!Source/ZZRC/*.hex
+!Source/ZRC512/*.bin
+!Source/Z1RCC/*.bin
+!Source/ZZRCC/*.bin
 !Tools/cpm/**
 !Tools/unix/zx/*
 !Tools/zx/*

Binary/CPNET/Clean.cmd

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

Binary/CPNET/Makefile

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

Binary/CPNET/ReadMe.txt

@@ -0,0 +1,38 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory contains the CP/NET client packages.  Please refer to 
+the RomWBW User Guide for instructions on installing these packages.  
+Either the MT011 RCBus module or the Duodyne Disk I/O board is required.
+
+All of these files come from Douglas Miller.  Please refer to
+https://github.com/durgadas311/cpnet-z80 for more information, complete
+documentation and the latest source code.  Refer to the RomWBW
+User Guide for basic installation and usage instructions under RomWBW.
+
+| File         | CP/NET Version | OS       | Hardware              |
++--------------+----------------+----------+-----------------------+
+| CPN12MT.LBR  | CP/NET 1.2     | CP/M 2.2 | RCBus w/ MT011        |
+| CPN3MT.LBR   | CP/NET 3       | CP/M 3   | RCBus w/ MT011        |
+| CPN12DUO.LBR | CP/NET 1.2     | CP/M 2.2 | Duodyne w/ Disk I/O   |
+| CPN3DUO.LBR  | CP/NET 3       | CP/M 3   | Duodyne w/ Disk I/O   |
+
+In general, to use CP/NET on RomWBW, it is intended that you will
+extract the appropriate set of files into your default directory in
+user area 0.  Refer to the RomWBW User Guide for more information.
+
+The libraries include enhanced help files appropriate for the version 
+of CP/NET.  Rename the desired topic collection to HELP.HLP on the
+target system.
+
+CPM2NET.HLP	CP/M 2.2 basic system with CP/NET 1.2
+CPNET12.HLP	CP/NET 1.2 help only
+CPM3NET.HLP	CP/M 3 basic system with CP/NET 3
+CPNET3.HLP	CP/NET 3 help only
+
+-- WBW 7:14 AM 2/11/2024

Binary/Clean.cmd

@@ -14,3 +14,4 @@ if exist *.eeprom del *.eeprom
 pushd Apps && call Clean || exit /b 1 & popd
 pushd CPM3 && call Clean || exit /b 1 & popd
 pushd ZPM3 && call Clean || exit /b 1 & popd
+pushd CPNET && call Clean || exit /b 1 & popd

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

@@ -1,6 +1,6 @@
 TOOLS = ../Tools
 MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.img *.rom *.com *.eeprom)
-SUBDIRS = Apps CPM3 ZPM3
+SUBDIRS = Apps CPM3 ZPM3 CPNET
 
 include $(TOOLS)/Makefile.inc
 

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)
 ---------------------------------------
@@ -110,7 +110,9 @@ 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.
+"RomWBW User Guide" found in the Doc directory.  The contents of
+the disk images is contained in the "RomWBW Disk Catalog", but it
+is significantly out-of-date.
 
 The contents of the floppy/hard disk images are created by 
 the BuildImages.cmd script in the Source directory.  Additional 

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing to RomWBW
+
+> **WARNING**: The `dev` branch of RomWBW has been deprecated as of v3.4.  All Pull Requests should now target the `master` branch.
+
+Contributions of all kinds to RomWBW are welcomed and greatly appreciated.
+
+- Reporting bug(s) and suggesting new feature(s)
+- Discussing the current state of the code
+- Submitting a fixes and enhancements
+
+## RomWBW GitHub Repository
+
+The [RomWBW GitHub Repository](https://github.com/wwarthen/RomWBW) is the primary location for developing, supporting, and distributing RomWBW.  Although input is gladly accepted from almost any channel, the GitHub Repository is preferred.
+
+- Use **Issues** to report bugs, request enhancements, or ask usage questions.
+- Use **Discussions** to interact with others
+- Use **Pull Requests** to submit content (code, documentation, etc.)
+
+## Submitting Content
+
+This RomWBW Project uses the standard [GitHub Flow](https://docs.github.com/en/get-started/quickstart/github-flow).  Submission of content changes (including code) are ideally done via Pull Requests.
+
+- Submitters are advised to contact [Wayne Warthen](mailto:wwarthen@gmail.com) or start a GitHub Discussion prior to starting any significant work.  This is simply to ensure that submissions are consistent
+  with the overall goals and intentions of RomWBW.
+- All submissions should be based on the `master` branch.  To create your submission, fork the RomWBW repository and create your branch from `master`.  Make (and test) your changes in your personal fork.
+- Please update relevant documentation and the `ChangeLog` found in the `Doc` folder.
+- You are encouraged to comment your submissions to ensure your work is properly attributed.
+- When ready, submit a Pull Request to merge your forked branch into the RomWBW master branch.
+
+## Coding Style
+
+Due to the nature of the project, you will find a variety of coding styles.  When making changes to existing code, please try to be consistent with the existing coding style.  You may not like the current style, but no one likes mixed styles
+in one file/module.
+
+Be careful with white space.  RomWBW is primarily assembly langauge code.  The use of tab stops at every 8 characters is pretty standard for assembler.  If you use something else, then your code will look odd when viewed by others.
+
+In most cases, the use of `<cr><lf>` line endings is preferred.  This is standard for the operating systems of the era that RomWBW provides.  Also note that CP/M text files should end with a ctrl-Z (0x1A).  This is not magically added by the
+tools that generate the disk images.
+
+## License
+
+RomWBW is licensed under GPLv3.  When you submit code changes, your submissions are understood to be under the same [GPLv3 License](https://www.gnu.org/licenses/gpl-3.0.html) that covers the project.

Doc/ChangeLog.txt

@@ -1,3 +1,96 @@
+Version 3.5
+-----------
+- M?F: Fix for hours display in HBRTC application
+- M?F: Fix for assembly error in DS1501RTC driver
+- WBW: Add VT-100 graphics char selection to Propeller firmware
+- WBW: Allow all lines of VGA display to be used on Propeller firmware
+- WBW: Allow front panel LED/Switch bits to be inverted in config
+- WBW: Add API to expose application banks available
+- WBW: Added console takeover at boot loader prompt
+- L?N: Fixed Propeller font vertical line character to align properly
+- L?S: EF9345 video display controller driver
+- WBW: Added Cowgol disk image based on the work of Ladislau Szilagyi
+- WBW: Added support for CP/NET on Duodyne Disk I/O
+- DDW: Added support for Duodyne Media board
+- WBW: Auto restore TMS video on user reset (CP/M warm boot)
+- L?B: Added support for NABU w/ RomWBW Option Board
+
+Version 3.4
+-----------
+NOTE: Changes require HBIOS/CBIOS/Apps sync, version bump to 3.4 to ensure integrity
+- WBW: Device type number moved from upper nibble to full byte
+- A?C: Support for EP ITX-Mini Z180 Platform
+- M?R: Significant improvement in User Guide document
+- J?P: Preliminary support for Monsputer (MON)
+- JLC: Standardize TMS driver memory map for compatibility
+- WBW: Improved IDE device detection
+- WBW: Fixed decompression when run on Z280
+- K?B: WDATE generic HBIOS date/time utility
+- WBW: Create new DSKY framework with simple driver style interface
+- JBL: Added ColecoVision config in TMS driver
+- WBW: Added support for interrupt mode 1 on Z180
+- WBW: Added S100 platform
+- WBW: Added Duodyne platform
+- WBW: Incorporated John Monahan's S100 Monitor in S100 platform build
+- WBW: Support ESP32 on Duodyne
+- M?C: Fixed port specification when using XM.COM send transfers
+- PMS: Support for Duodyne DMA
+- WBW: Added Serial ROM (SROM.COM) utility
+- WBW: Support S100 Propeller Console
+- SCC: Added support for SC700
+- WBW: Added Heath H8 platform
+- D?J: Enhanced build to run on Raspberry Pi 4
+- WBW: Complete overhaul of ROMless boot operation
+- WBW: Prevent access to slices outside of partition
+- T?P: Contributed the HTALK utility
+- WBW: CTS stall detection
+- W?S: Updated FLASH utility to v1.3.7
+- L?N: Updated UNARC to new OS universal version
+- B?C: Added support for Z1RCC
+- M?R: User Guide enhancements and corrections
+- D?H: Added support for specification of secondary console
+- WBW: Added platform for Monsputer
+- WBW: Added FAT.COM to standard ROM Disk (removed RMAC.COM & LINK.COM)
+
+Version 3.3
+-----------
+NOTE: v3.3 was never released
+- 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 IMM 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 +102,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
@@ -75,7 +168,7 @@ 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
@@ -113,8 +206,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
@@ -133,7 +226,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
@@ -161,7 +254,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
@@ -171,7 +264,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
@@ -189,26 +282,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)

Makefile

@@ -1,5 +1,14 @@
-all:
+.PHONY: tools source clean clobber diff dist
+
+.ONESHELL:
+.SHELLFLAGS = -cex
+
+all: tools source
+
+tools:
 	$(MAKE) --directory Tools
+
+source:
 	$(MAKE) --directory Source
 
 clean:
@@ -14,6 +23,9 @@ diff:
 	$(MAKE) --directory Source diff
 
 dist:
-	$(MAKE) ROM_PLATFORM=dist 2>&1 | tee make.log
-	$(MAKE) --directory Source clean
+	$(MAKE) ROM_PLATFORM=dist
 	$(MAKE) --directory Tools clean
+	$(MAKE) --directory Source clean
+
+distlog:
+	$(MAKE) dist 2>&1 | tee make.log

ReadMe.md

@@ -1,9 +1,9 @@
 
 
 **RomWBW ReadMe** \
-Version 3.1 Pre-release \
+Version 3.5 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-16 Feb 2023
+03 May 2024
 
 # Overview
 
@@ -14,15 +14,24 @@ platforms are supported including those produced by these developer
 communities:
 
 - [RetroBrew Computers](https://www.retrobrewcomputers.org)
-- [RC2014](https://rc2014.co.uk),
+  (<https://www.retrobrewcomputers.org>)
+- [RC2014](https://rc2014.co.uk) (<https://rc2014.co.uk>),  
   [RC2014-Z80](https://groups.google.com/g/rc2014-z80)
-- [retro-comp](https://groups.google.com/forum/#!forum/retro-comp)
+  (<https://groups.google.com/g/rc2014-z80>)
+- [Retro Computing](https://groups.google.com/g/retro-comp)
+  (<https://groups.google.com/g/retro-comp>)
 - [Small Computer Central](https://smallcomputercentral.com/)
+  (<https://smallcomputercentral.com/>)
+
+A complete list of the currently supported platforms is found in the
+\[Installation\] section.
 
 General features include:
 
+- Z80 Family CPUs including Z80, Z180, and Z280
 - Banked memory services for several banking designs
-- Disk drivers for RAM, ROM, Floppy, IDE, CF, and SD
+- Disk drivers for RAM, ROM, Floppy, IDE ATA/ATAPI, CF, SD, USB, Zip,
+  Iomega
 - Serial drivers including UART (16550-like), ASCI, ACIA, SIO
 - Video drivers including TMS9918, SY6545, MOS8563, HD6445
 - Keyboard (PS/2) drivers via VT8242 or PPI interfaces
@@ -42,11 +51,11 @@ ROM firmware itself:
 
 A dynamic disk drive letter assignment mechanism allows mapping
 operating system drive letters to any available disk media.
-Additionally, mass storage devices (IDE Disk, CF Card, SD Card) support
-the use of multiple slices (up to 256 per device). Each slice contains a
-complete CP/M filesystem and can be mapped independently to any drive
-letter. This overcomes the inherent size limitations in legacy OSes and
-allows up to 2GB of accessible storage on a single device.
+Additionally, mass storage devices (IDE Disk, CF Card, SD Card, etc.)
+support the use of multiple slices (up to 256 per device). Each slice
+contains a complete CP/M filesystem and can be mapped independently to
+any drive letter. This overcomes the inherent size limitations in legacy
+OSes and allows up to 2GB of accessible storage on a single device.
 
 The pre-built ROM firmware images are generally suitable for most users.
 However, it is also very easy to modify and build custom ROM images that
@@ -66,7 +75,7 @@ changing media.
 By design, RomWBW isolates all of the hardware specific functions in the
 ROM chip itself. The ROM provides a hardware abstraction layer such that
 all of the operating systems and applications on a disk will run on any
-RomWBW-based system. To put it simply, you can take a disk (or CF/SD
+RomWBW-based system. To put it simply, you can take a disk (or CF/SD/USB
 Card) and move it between systems transparently.
 
 A tool is provided that allows you to access a FAT-12/16/32 filesystem.
@@ -76,18 +85,19 @@ OSes such as Windows, MacOS, and Linux very easy.
 
 # Acquiring RomWBW
 
-The [RomWBW Repository](https://github.com/wwarthen/RomWBW) on GitHub is
-the official distribution location for all project source and
-documentation. The fully-built distribution releases are available on
-the [RomWBW Releases Page](https://github.com/wwarthen/RomWBW/releases)
-of the repository. On this page, you will normally see a Development
-Snapshot as well as recent stable releases. Unless you have a specific
-reason, I suggest you stick to the most recent stable release. Expand
-the “Assets” drop-down for the release you want to download, then select
-the asset named RomWBW-vX.X.X-Package.zip. The Package asset includes
-all pre-built ROM and Disk images as well as full source code. The other
-assets contain only source code and do not have the pre-built ROM or
-disk images.
+The [RomWBW Repository](https://github.com/wwarthen/RomWBW)
+(<https://github.com/wwarthen/RomWBW>) on GitHub is the official
+distribution location for all project source and documentation. The
+fully-built distribution releases are available on the [RomWBW Releases
+Page](https://github.com/wwarthen/RomWBW/releases)
+(<https://github.com/wwarthen/RomWBW/releases>) of the repository. On
+this page, you will normally see a Development Snapshot as well as
+recent stable releases. Unless you have a specific reason, I suggest you
+stick to the most recent stable release. Expand the “Assets” drop-down
+for the release you want to download, then select the asset named
+RomWBW-vX.X.X-Package.zip. The Package asset includes all pre-built ROM
+and Disk images as well as full source code. The other assets contain
+only source code and do not have the pre-built ROM or disk images.
 
 All source code and distributions are maintained on GitHub. Code
 contributions are very welcome.
@@ -128,8 +138,8 @@ contributions. The list below is probably missing many names – please
 let me know if I missed you!
 
 - Andrew Lynch started it all when he created the N8VEM Z80 SBC which
-  became the first platform RomWBW supported. Some of his code can still
-  be found in RomWBW.
+  became the first platform RomWBW supported. Some of his original code
+  can still be found in RomWBW.
 
 - Dan Werner wrote much of the code from which RomWBW was originally
   derived and he has always been a great source of knowledge and advice.
@@ -140,23 +150,30 @@ let me know if I missed you!
   due to internal changes within RomWBW. As of RomWBW 2.6, these
   applications are no longer provided.
 
+- Sergey Kiselev created several hardware platforms for RomWBW including
+  the very popular Zeta.
+
 - David Giles created support for the Z180 CSIO which is now included SD
   Card driver.
 
-- Ed Brindley contributed some of the code that supports the RC2014
+- Phil Summers contributed the Forth and BASIC adaptations in ROM, the
+  AY-3-8910 sound driver, DMA support, and a long list of general code
+  and documentation enhancements.
+
+- Ed Brindley contributed some of the code that supports the RCBus
   platform.
 
-- Phil Summers contributed the Forth and BASIC adaptations in ROM, the
-  AY-3-8910 sound driver as well as a long list of general code
-  enhancements.
-
 - Spencer Owen created the RC2014 series of hobbyist kit computers which
-  has exponentially increased RomWBW usage.
+  has exponentially increased RomWBW usage. Some of his kits include
+  RomWBW.
 
 - Stephen Cousins has likewise created a series of hobbyist kit
   computers at Small Computer Central and is distributing RomWBW with
   many of them.
 
+- Alan Cox has contributed some driver code and has provided a great
+  deal of advice.
+
 - The CP/NET client files were developed by Douglas Miller.
 
 - Phillip Stevens contributed support for FreeRTOS.
@@ -176,6 +193,44 @@ let me know if I missed you!
 
 - The RomWBW Disk Catalog document was produced by Mykl Orders.
 
+- Rob Prouse has created many of the supplemental disk images including
+  Aztec C, HiTech C, SLR Z80ASM, Turbo Pascal, Microsoft BASIC Compiler,
+  Microsoft Fortran Compiler, and a Games compendium.
+
+- Martin R has provided substantial help reviewing and improving the
+  User Guide.
+
+- Jacques Pelletier has contributed the DS1501 RTC driver code.
+
+- Jose Collado has contributed enhancements to the TMS driver including
+  compatibility with standard TMS register configuration.
+
+- Kevin Boone has contributed a generic HBIOS date/time utility (WDATE).
+
+- Matt Carroll has contributed a fix to XM.COM that corrects the port
+  specification when doing a send.
+
+- Dean Jenkins enhanced the build process to accommodate the Raspberry
+  Pi 4.
+
+- Tom Plano has contributed a new utility (HTALK) to allow talking
+  directly to HBIOS COM ports.
+
+- Lars Nelson has contributed several generic utilities such as a
+  universal (OS agnostic) UNARC application.
+
+- Dylan Hall added support for specifying a secondary console.
+
+- Bill Shen has contributed boot loaders for several of his systems.
+
+- Laszlo Szolnoki has contributed an EF9345 video display controller
+  driver.
+
+- Ladislau Szilagyi has contributed an enhanced version of CP/M Cowgol
+  that leverages RomWBW memory banking.
+
+- Les Bird has contributed support for the NABU w/ Option Board
+
 Contributions of all kinds to RomWBW are very welcome.
 
 # Licensing
@@ -197,14 +252,15 @@ Portions of RomWBW were created by, contributed by, or derived from the
 work of others. It is believed that these works are being used in
 accordance with the intentions and/or licensing of their creators.
 
-If anyone feels their work is being used outside of it’s intended
+If anyone feels their work is being used outside of its intended
 licensing, please notify:
 
-> Wayne Warthen wwarthen@gmail.com
+> Wayne Warthen  
+> <wwarthen@gmail.com>
 
 RomWBW is an aggregate work. It is composed of many individual,
 standalone programs that are distributed as a whole to function as a
-cohesive system. Each program may have it’s own licensing which may be
+cohesive system. Each program may have its own licensing which may be
 different from other programs within the aggregate.
 
 In some cases, a single program (e.g., CP/M Operating System) is

ReadMe.txt

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-16 Feb 2023
+03 May 2024
 
 
 
@@ -13,15 +13,21 @@ Z80/180/280 retro-computing hardware systems. A wide variety of
 platforms are supported including those produced by these developer
 communities:
 
--   RetroBrew Computers
--   RC2014, RC2014-Z80
--   retro-comp
--   Small Computer Central
+-   RetroBrew Computers (https://www.retrobrewcomputers.org)
+-   RC2014 (https://rc2014.co.uk),
+    RC2014-Z80 (https://groups.google.com/g/rc2014-z80)
+-   Retro Computing (https://groups.google.com/g/retro-comp)
+-   Small Computer Central (https://smallcomputercentral.com/)
+
+A complete list of the currently supported platforms is found in the
+[Installation] section.
 
 General features include:
 
+-   Z80 Family CPUs including Z80, Z180, and Z280
 -   Banked memory services for several banking designs
--   Disk drivers for RAM, ROM, Floppy, IDE, CF, and SD
+-   Disk drivers for RAM, ROM, Floppy, IDE ATA/ATAPI, CF, SD, USB, Zip,
+    Iomega
 -   Serial drivers including UART (16550-like), ASCI, ACIA, SIO
 -   Video drivers including TMS9918, SY6545, MOS8563, HD6445
 -   Keyboard (PS/2) drivers via VT8242 or PPI interfaces
@@ -41,11 +47,11 @@ ROM firmware itself:
 
 A dynamic disk drive letter assignment mechanism allows mapping
 operating system drive letters to any available disk media.
-Additionally, mass storage devices (IDE Disk, CF Card, SD Card) support
-the use of multiple slices (up to 256 per device). Each slice contains a
-complete CP/M filesystem and can be mapped independently to any drive
-letter. This overcomes the inherent size limitations in legacy OSes and
-allows up to 2GB of accessible storage on a single device.
+Additionally, mass storage devices (IDE Disk, CF Card, SD Card, etc.)
+support the use of multiple slices (up to 256 per device). Each slice
+contains a complete CP/M filesystem and can be mapped independently to
+any drive letter. This overcomes the inherent size limitations in legacy
+OSes and allows up to 2GB of accessible storage on a single device.
 
 The pre-built ROM firmware images are generally suitable for most users.
 However, it is also very easy to modify and build custom ROM images that
@@ -65,7 +71,7 @@ changing media.
 By design, RomWBW isolates all of the hardware specific functions in the
 ROM chip itself. The ROM provides a hardware abstraction layer such that
 all of the operating systems and applications on a disk will run on any
-RomWBW-based system. To put it simply, you can take a disk (or CF/SD
+RomWBW-based system. To put it simply, you can take a disk (or CF/SD/USB
 Card) and move it between systems transparently.
 
 A tool is provided that allows you to access a FAT-12/16/32 filesystem.
@@ -78,16 +84,18 @@ OSes such as Windows, MacOS, and Linux very easy.
 ACQUIRING ROMWBW
 
 
-The RomWBW Repository on GitHub is the official distribution location
-for all project source and documentation. The fully-built distribution
-releases are available on the RomWBW Releases Page of the repository. On
-this page, you will normally see a Development Snapshot as well as
-recent stable releases. Unless you have a specific reason, I suggest you
-stick to the most recent stable release. Expand the “Assets” drop-down
-for the release you want to download, then select the asset named
-RomWBW-vX.X.X-Package.zip. The Package asset includes all pre-built ROM
-and Disk images as well as full source code. The other assets contain
-only source code and do not have the pre-built ROM or disk images.
+The RomWBW Repository (https://github.com/wwarthen/RomWBW) on GitHub is
+the official distribution location for all project source and
+documentation. The fully-built distribution releases are available on
+the RomWBW Releases Page (https://github.com/wwarthen/RomWBW/releases)
+of the repository. On this page, you will normally see a Development
+Snapshot as well as recent stable releases. Unless you have a specific
+reason, I suggest you stick to the most recent stable release. Expand
+the “Assets” drop-down for the release you want to download, then select
+the asset named RomWBW-vX.X.X-Package.zip. The Package asset includes
+all pre-built ROM and Disk images as well as full source code. The other
+assets contain only source code and do not have the pre-built ROM or
+disk images.
 
 All source code and distributions are maintained on GitHub. Code
 contributions are very welcome.
@@ -129,8 +137,8 @@ contributions. The list below is probably missing many names – please
 let me know if I missed you!
 
 -   Andrew Lynch started it all when he created the N8VEM Z80 SBC which
-    became the first platform RomWBW supported. Some of his code can
-    still be found in RomWBW.
+    became the first platform RomWBW supported. Some of his original
+    code can still be found in RomWBW.
 
 -   Dan Werner wrote much of the code from which RomWBW was originally
     derived and he has always been a great source of knowledge and
@@ -142,23 +150,30 @@ let me know if I missed you!
     due to internal changes within RomWBW. As of RomWBW 2.6, these
     applications are no longer provided.
 
+-   Sergey Kiselev created several hardware platforms for RomWBW
+    including the very popular Zeta.
+
 -   David Giles created support for the Z180 CSIO which is now included
     SD Card driver.
 
--   Ed Brindley contributed some of the code that supports the RC2014
+-   Phil Summers contributed the Forth and BASIC adaptations in ROM, the
+    AY-3-8910 sound driver, DMA support, and a long list of general code
+    and documentation enhancements.
+
+-   Ed Brindley contributed some of the code that supports the RCBus
     platform.
 
--   Phil Summers contributed the Forth and BASIC adaptations in ROM, the
-    AY-3-8910 sound driver as well as a long list of general code
-    enhancements.
-
 -   Spencer Owen created the RC2014 series of hobbyist kit computers
-    which has exponentially increased RomWBW usage.
+    which has exponentially increased RomWBW usage. Some of his kits
+    include RomWBW.
 
 -   Stephen Cousins has likewise created a series of hobbyist kit
     computers at Small Computer Central and is distributing RomWBW with
     many of them.
 
+-   Alan Cox has contributed some driver code and has provided a great
+    deal of advice.
+
 -   The CP/NET client files were developed by Douglas Miller.
 
 -   Phillip Stevens contributed support for FreeRTOS.
@@ -178,6 +193,45 @@ let me know if I missed you!
 
 -   The RomWBW Disk Catalog document was produced by Mykl Orders.
 
+-   Rob Prouse has created many of the supplemental disk images
+    including Aztec C, HiTech C, SLR Z80ASM, Turbo Pascal, Microsoft
+    BASIC Compiler, Microsoft Fortran Compiler, and a Games compendium.
+
+-   Martin R has provided substantial help reviewing and improving the
+    User Guide.
+
+-   Jacques Pelletier has contributed the DS1501 RTC driver code.
+
+-   Jose Collado has contributed enhancements to the TMS driver
+    including compatibility with standard TMS register configuration.
+
+-   Kevin Boone has contributed a generic HBIOS date/time utility
+    (WDATE).
+
+-   Matt Carroll has contributed a fix to XM.COM that corrects the port
+    specification when doing a send.
+
+-   Dean Jenkins enhanced the build process to accommodate the Raspberry
+    Pi 4.
+
+-   Tom Plano has contributed a new utility (HTALK) to allow talking
+    directly to HBIOS COM ports.
+
+-   Lars Nelson has contributed several generic utilities such as a
+    universal (OS agnostic) UNARC application.
+
+-   Dylan Hall added support for specifying a secondary console.
+
+-   Bill Shen has contributed boot loaders for several of his systems.
+
+-   Laszlo Szolnoki has contributed an EF9345 video display controller
+    driver.
+
+-   Ladislau Szilagyi has contributed an enhanced version of CP/M Cowgol
+    that leverages RomWBW memory banking.
+
+-   Les Bird has contributed support for the NABU w/ Option Board
+
 Contributions of all kinds to RomWBW are very welcome.
 
 
@@ -202,14 +256,15 @@ Portions of RomWBW were created by, contributed by, or derived from the
 work of others. It is believed that these works are being used in
 accordance with the intentions and/or licensing of their creators.
 
-If anyone feels their work is being used outside of it’s intended
+If anyone feels their work is being used outside of its intended
 licensing, please notify:
 
-  Wayne Warthen wwarthen@gmail.com
+  Wayne Warthen
+  wwarthen@gmail.com
 
 RomWBW is an aggregate work. It is composed of many individual,
 standalone programs that are distributed as a whole to function as a
-cohesive system. Each program may have it’s own licensing which may be
+cohesive system. Each program may have its own licensing which may be
 different from other programs within the aggregate.
 
 In some cases, a single program (e.g., CP/M Operating System) is

Source/Apps/Build.cmd

@@ -1,13 +1,10 @@
 @echo off
 setlocal
 
-set TOOLS=../../Tools
+set TOOLS=..\..\Tools
 set APPBIN=..\..\Binary\Apps
-
 set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
-
 set TASMTABS=%TOOLS%\tasm32
-
 set CPMDIR80=%TOOLS%/cpm/
 
 call :asm syscopy || exit /b
@@ -32,6 +29,7 @@ pushd Dev && call Build || exit /b & popd
 pushd VGM && call Build || exit /b & popd
 pushd cpuspd && call Build || exit /b & popd
 pushd Survey && call Build || exit /b & popd
+pushd HTalk && call Build || exit /b & popd
 
 copy *.com %APPBIN%\ || exit /b
 

Source/Apps/Clean.cmd

@@ -18,3 +18,4 @@ pushd Dev && call Clean || exit /b 1 & popd
 pushd VGM && call Clean || exit /b 1 & popd
 pushd cpuspd && call Clean || exit /b 1 & popd
 pushd Survey && call Clean || exit /b 1 & popd
+pushd HTalk && call Clean || exit /b 1 & popd

Source/Apps/FAT/ReadMe.md

@@ -0,0 +1,158 @@
+# RomWBW HBIOS CP/M FAT Utility ("FAT.COM")
+
+Author: Wayne Warthen \
+Updated: 6-May-2024
+
+This application allows copying files between CP/M filesystems and FAT 
+filesystems (DOS, Windows, Mac, Linux, etc.).  The application runs on 
+RomWBW hosted CP/M (and compatible) operating systems. The application 
+also has limited file management capabilities on FAT filesystems 
+including directory listing, renaming, deleting, and sub-directory 
+creation.
+
+### Usage:
+
+```
+  FAT DIR <path>
+  FAT COPY <src> <dst>
+  FAT REN <from> <to>
+  FAT DEL <path>[<file>|<dir>]
+  FAT MD <path>
+  FAT FORMAT <drv>
+```
+
+  CP/M filespec: \<d\>:FILENAME.EXT (\<d\> is CP/M drive letter A-P) \
+  FAT filespec:  \<u\>:/DIR/FILENAME.EXT (\<u\> is disk unit #)
+
+### Notes:
+
+ - Partitioned or non-partitioned media is handled automatically.
+   A floppy drive is a good example of a non-partitioned FAT
+   filesystem and will be recognized.  Larger media will typically
+   have a partition table which will be recognized by the
+   application to find the FAT filesystem.
+   
+ - Although RomWBW-style CP/M media does not know anything about
+   partition tables, it is entirely possible to have media that
+   has both CP/M and FAT file systems on it.  This is accomplished
+   by creating a FAT filesystem on the media that starts on a track
+   beyond the last track used by CP/M.  Each CP/M slice can occupy
+   up to 8MB.  So, make sure to start your FAT partition beyond
+   (slice count) * 9MB.
+
+ - The application infers whether you are attempting to reference
+   a FAT or CP/M filesystem via the drive specifier (char before ':').
+   A numeric drive character specifies the HBIOS disk unit number
+   for FAT access.  An alpha (A-P) character indicates a CP/M
+   file system access targeting the specified drive letter.  If there
+   is no drive character specified, the current CP/M filesystem and
+   current CP/M drive is assumed.  For example:
+   
+   `2:README.TXT` refers to FAT file README.TXT on disk unit #2 \
+   `C:README.TXT` refers to CP/M file README.TXT on CP/M drive C: \
+   `README.TXT` refers to CP/M file README.TXT on current CP/M drive
+   
+ - FAT files with SYS, HIDDEN, or R/O attributes are not given
+   any special treatment.  Such files are found and processed
+   like any other file.  However, any attempt to write to a
+   read-only file will fail and the application will abort.
+ 
+ - It is not currently possible to reference CP/M user areas other
+   than the current user.  To copy files to alternate user areas,
+   you must switch to the desired user number first or use an
+   additional step to copy the file to the desired user area.
+   
+ - Accessing FAT filesystems on a floppy requires the use of
+   RomWBW HBIOS v2.9.1-pre.13 or greater.
+
+ - Only the first 8 RomWBW disk units (0-7) can be referenced.
+   
+ - Files written are not verified.
+ 
+ - Wildcard matching in FAT filesystems is a bit unusual as
+   implemented by FatFs.  See FatFs documentation.
+
+ - The `FAT FORMAT` command will not perform a physical format on
+   floppy disks.  You must use FDU to do this prior to using
+   `FAT FORMAT`.
+
+ - Formatting (`FAT FORMAT`) of floppies does not work well.  The    
+   underlying FatFs library uses some non-standard fields.  The 
+   resulting floppy may or may not be useable on other systems.  It is 
+   best to format a FAT floppy on a Windows or DOS system.  You should 
+   have no problems copying files to/from such a floppy using `FAT`.
+
+### Known Issues
+
+ - CP/M (and workalike) OSes have significant restrictions on filename
+   characters.  The FAT application will block any attempt to create a
+   file on the CP/M filesystem containing any of these prohibited
+   characters:
+
+|         `< > . , ; : ? * [ ] |/ \`
+
+   The operation will be aborted with "`Error: Invalid Path Name`" if such
+   a filename character is encountered.
+
+   Since MS-DOS does allow some of these characters, you can have
+   issues when copying files from MS-DOS to CP/M if the MS-DOS filenames
+   use these characters.  Unfortunately, FAT is not yet smart enough to
+   substitute illegal characters with legal ones.  So, you will need to
+   clean the filenames before trying to copy them to CP/M.
+
+ - The FAT application does try to detect the scenario where you are
+   copying a file to itself.  However, this detection is not perfect and
+   can corrupt a file if it occurs.  Be careful to avoid this.
+
+### License:
+
+  GNU GPLv3 (see file LICENSE.txt)
+
+### Build Notes:
+
+ - Source is maintained on GitHub at <https://github.com/wwarthen/FAT>.
+
+ - Application is based on FatFs.  FatFs source is included.  See
+   <http://elm-chan.org/fsw/ff/>.
+
+ - SDCC compiler v4.3 or greater is required to build.  New calling
+   conventions introduced in v4.3 are assumed.
+
+ - See Build.cmd for sample build script under Windows.  References
+   to SDCC must be updated for your environment.
+   
+ - Note that ff.c (core FatFs code) generates quite a few compiler
+   warnings (all appear to be benign).
+
+### To Do:
+
+ - Allow ^C to abort any operation in progress.
+ 
+ - Allow referencing more than the first 8 RomWBW disk units.
+ 
+ - Handle wildcards in destination, e.g.:
+
+   `FAT REN 2:/*.TXT 2:/*.BAK`
+ 
+ - Do something intelligent with R/O and SYS file attributes
+ 
+ - Support UNA
+ 
+### History:
+
+| Date        | Version | Notes                                                       |
+|------------:|-------- |-------------------------------------------------------------|
+| 2-May-2019  | v0.9    | (beta) initial release                                      |
+| 7-May-2019  | v0.9.1  | (beta) added REN and DEL                                    |
+| 8-May-2019  | v0.9.2  | (beta) handle file collisions w/ user prompt                |
+| 8-Oct-2019  | v0.9.3  | (beta) fixed incorrect filename buffer size (MAX_FN)        |
+| 10-Oct-2019 | v0.9.4  | (beta) upgraded to FatFs R0.13c                             |
+| 10-Oct-2019 | v0.9.5  | (beta) added MD (make directory)                            |
+| 10-Oct-2019 | v0.9.6  | (beta) added FORMAT                                         |
+| 11-Oct-2019 | v0.9.7  | (beta) fix FORMAT to use existing partition table entries   |
+|             |         | add attributes to directory listing                         |
+| 12-Apr-2021 | v0.9.8  | (beta) support CP/NET drives                                |
+| 12-Oct-2023 | v0.9.9  | (beta) handle updated HBIOS Disk Device call                |
+| 6-Jan-2024  | v1.0.0  | updated to latest FsFat (v0.15)                             |
+|             |         | updated to latest SDCC (v4.3)                               |
+| 6-May-2024  | v1.1.0  | improve floppy format boot record                           |

Source/Apps/FAT/ReadMe.txt

@@ -1,104 +0,0 @@
-RomWBW HBIOS CP/M FAT Utility ("FAT.COM")
-
-Author: Wayne Warthen
-Updated: 12-Apr-2021
-
-Application to manipulate and exchange files with a FAT (DOS)
-filesystem.  Runs on any HBIOS hosted CP/M implementation.
-
-USAGE:
-  FAT DIR <path>
-  FAT COPY <src> <dst>
-  FAT REN <from> <to>
-  FAT DEL <path>[<file>|<dir>]
-  FAT MD <path>
-  FAT FORMAT <drv>
-
-  CP/M filespec: <d>:FILENAME.EXT (<d> is CP/M drive letter A-P)
-  FAT filespec:  <u>:/DIR/FILENAME.EXT (<u> is disk unit #)
-	
-LICENSE:
-  GNU GPLv3 (see file LICENSE.txt)
-
-NOTES:
- - Partitioned or non-partitioned media is handled automatically.
-   A floppy drive is a good example of a non-partitioned FAT
-   filesystem and will be recognized.  Larger media will typically
-   have a partition table which will be recognized by the
-   application to find the FAT filesystem.
-   
- - Although RomWBW-style CP/M media does not know anything about
-   partition tables, it is entirely possible to have media that
-   has both CP/M and FAT file systems on it.  This is accomplished
-   by creating a FAT filesystem on the media that starts on a track
-   beyond the last track used by CP/M.  Each CP/M slice on a
-   media will occupy a little over 8MB.  So, make sure to start
-   your FAT partition beyond (slice count) * 8MB.
-
- - The application infers whether you are attempting to reference
-   a FAT or CP/M filesystem via the drive specifier (char before ':').
-   A numeric drive character specifies the HBIOS disk unit number
-   for FAT access.  An alpha (A-P) character indicates a CP/M
-   file system access targeting the specified drive letter.  If there
-   is no drive character specified, the current CP/M filesystem and
-   current CP/M drive is assumed.  For example:
-   
-   "2:README.TXT" refers to FAT file README.TXT on disk unit #2
-   "C:README.TXT" refers to CP/M file README.TXT on CP/M drive C
-   "README.TXT" refers to CP/M file README.TXT on current CP/M drive
-   
- - FAT files with SYS, HIDDEN, or R/O only attributes are not given
-   any special treatment.  Such files are found and processed
-   like any other file.  However, any attempt to write to a
-   read-only file will fail and the application will abort.
- 
- - It is not currently possible to reference CP/M user areas other
-   than the current user.  To copy files to alternate user areas,
-   you must switch to the desired user number first or use an
-   additional step to copy the file to the desired user area.
-   
- - Accessing FAT filesystems on a floppy requires the use of
-   RomWBW HBIOS v2.9.1-pre.13 or greater.
-   
- - Files written are not verified.
- 
- - Wildcard matching in FAT filesystems is a bit unusual as
-   implemented by FatFs.  See FatFs documentation.
-
-BUILD NOTES:
- - Source is maintained on GitHub at https://github.com/wwarthen/FAT
-
- - Application is based on FatFs.  FatFs source is included.
-
- - SDCC compiler is required to build (v4.0.0 known working).
-
- - ZX CP/M emulator is required to build (from RomWBW distribution).
-
- - See Build.cmd for sample build script under Windows.  References
-   to SDCC and ZX must be updated for your environment.
-   
- - Note that ff.c (core FatFs code) generates quite a few compiler
-   warnings (all appear to be benign).
-
-TO DO:
- - Allow ^C to abort any operation in progress.
- 
- - Handle wildcards in destination, e.g.:
-     "FAT REN 2:/*.TXT 2:/*.BAK"
- 
- - Do something intelligent with R/O and SYS files on FAT
- 
- - Support UNA
- 
-HISTORY:
-   2-May-2019: v0.9   (beta) initial release
-   7-May-2019: v0.9.1 (beta) added REN and DEL
-   8-May-2019: v0.9.2 (beta) handle file collisions w/ user prompt
-   8-Oct-2019: v0.9.3 (beta) fixed incorrect filename buffer size (MAX_FN)
-  10-Oct-2019: v0.9.4 (beta) upgraded to FatFs R0.13c
-  10-Oct-2019: v0.9.5 (beta) added MD (make directory)
-  10-Oct-2019: v0.9.6 (beta) added FORMAT
-  11-Oct-2019: v0.9.7 (beta) fix FORMAT to use existing partition table entries
-                             add attributes to directory listing
-  12-Apr-2021: v0.9.8 (beta) support CP/NET drives
-		      

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
@@ -48,7 +48,8 @@
 ;   2020-04-29: v5.5	ADDED SUPPORT FOR ETCHED PIXELS FDC
 ;   2020-12-12: v5.6	UPDATED SMALLZ80 TO NEW I/O ADDRESSES
 ;   2021-03-24: v5.7    ADDED SOME SINGLE-SIDED FORMATS
-;   2021-07-26: v5.8	ADDED SUPPORT MBC FDC
+;   2021-07-26: v5.8	ADDED SUPPORT FOR NHYODYNE (MBC) FDC
+;   2023-12-10: v5.9	ADDED SUPPORT FOR DUODYNE (DUO) FDC
 ;			
 ;_______________________________________________________________________________
 ;
@@ -85,13 +86,14 @@ FDC_SMZ80	.EQU		8
 FDC_DYNO	.EQU		9
 FDC_EPFDC	.EQU		10
 FDC_MBC		.EQU		11
+FDC_DUO		.EQU		12
 ;
 ; FDC MODE
 ;
 _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
 ;
 ;===============================================================================
@@ -219,8 +221,8 @@ INIT5:
 	XOR	A
 	RET
 		
-STR_BANNER	.DB	"Floppy Disk Utility (FDU) v5.8, 26-Jul-2021$"
-STR_BANNER2	.DB	"Copyright (C) 2021, Wayne Warthen, GNU GPL v3","$"
+STR_BANNER	.DB	"Floppy Disk Utility (FDU) v5.9, 10-Dec-2023$"
+STR_BANNER2	.DB	"Copyright (C) 2023, Wayne Warthen, GNU GPL v3","$"
 STR_HBIOS	.DB	" [HBIOS]$"
 STR_UBIOS	.DB	" [UBIOS]$"
 ;
@@ -292,6 +294,7 @@ FDCTBL:	;	LABEL		CONFIG DATA
 	.DW	STR_DYNO,	CFG_DYNO
 	.DW	STR_EPFDC,	CFG_EPFDC
 	.DW	STR_MBC,	CFG_MBC
+	.DW	STR_DUO,	CFG_DUO
 FDCCNT	.EQU	($-FDCTBL)/4	; FD CONTROLLER COUNT
 ;
 ; FDC LABEL STRINGS
@@ -307,7 +310,8 @@ STR_RCWDC	.TEXT	"RC-WDC$"
 STR_SMZ80	.TEXT	"SMZ80$"
 STR_DYNO	.TEXT	"DYNO$"
 STR_EPFDC	.TEXT	"EPFDC$"
-STR_MBC		.TEXT	"MBC$"
+STR_MBC		.TEXT	"NHYODYNE$"
+STR_DUO		.TEXT	"DUODYNE$"
 ;
 ; FDC CONFIGURATION BLOCKS
 ;
@@ -448,7 +452,18 @@ CFG_MBC:
 	.DB	035H	; CONFIGURATION CONTROL REGISTER
 	.DB	036H	; DACK (WHEN READ)
 	.DB	037H	; TERMINAL COUNT (W/ DACK)
-	.DB	0FFH	; NOT USED BY ZETA SBC V2
+	.DB	0FFH	; NOT USED
+	.DB	_PCAT	; MODE=
+;
+CFG_DUO:
+	.DB	080H	; FDC MAIN STATUS REGISTER
+	.DB	081H	; FDC DATA PORT
+	.DB	0FFH	; DATA INPUT REGISTER
+	.DB	086H	; DIGITAL OUTPUT REGISTER (WHEN WRITTEN)
+	.DB	085H	; CONFIGURATION CONTROL REGISTER
+	.DB	086H	; DACK (WHEN READ)
+	.DB	087H	; TERMINAL COUNT (W/ DACK)
+	.DB	0FFH	; NOT USED
 	.DB	_PCAT	; MODE=
 ;
 FDCID	.DB	0			; FDC IDENTIFIER (0 INDEXED)
@@ -465,12 +480,13 @@ 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	"  (L) Multi-Board Computer FDC\r\n"
+	.TEXT	"  (K) RCBus EPFDC\r\n"
+	.TEXT	"  (L) Nhyodyne FDC\r\n"
+	.TEXT	"  (M) Duodyne FDC\r\n"
 	.TEXT	"  (X) Exit\r\n"
 	.TEXT	"=== OPTION ===> $\r\n"
 ;	
@@ -1561,6 +1577,7 @@ MD_MAP:
 		.DB	%00000001	; DYNO	POLL
 		.DB	%00000001	; EPFDC	POLL
 		.DB	%00000001	; MBC	POLL
+		.DB	%00000001	; DUO	POLL
 ;
 ; MEDIA DESCRIPTION BLOCK
 ;
@@ -2021,7 +2038,7 @@ FM_DRAW0B:	; ZETA, DIO3
 	LD	A,(FST_DOR)
 	AND	00000010B
 	JR	FM_DRAW1
-FM_DRAW0C:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FM_DRAW0C:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	A,(FST_DOR)
 	AND	11110000B
 	JR	FM_DRAW1
@@ -2174,7 +2191,7 @@ FM_MOTOR0B:	; ZETA, DIO3
 	LD	A,(FST_DOR)
 	AND	00000010B
 	JR	FM_MOTOR1
-FM_MOTOR0C:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FM_MOTOR0C:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	A,(FST_DOR)
 	AND	11110000B
 	JR	FM_MOTOR1
@@ -2913,7 +2930,7 @@ FC_INIT1:	; DIO
 FC_INIT2:	; ZETA, DIO3
 	LD	A,(FCD_DORB)
 	JR	FC_INIT5
-FC_INIT3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FC_INIT3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	A,(FCD_DORC)
 	JR	FC_INIT5
 FC_INIT4:	; WDSMC
@@ -2957,7 +2974,7 @@ FC_RESETFDC1:	; ZETA, DIO3, RCSMC
 	POP	AF
 	OUT	(C),A
 	JR	FC_RESETFDC3
-FC_RESETFDC2:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FC_RESETFDC2:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	A,0
 	OUT	(C),A
 	LD	A,(FST_DOR)
@@ -2984,7 +3001,7 @@ FC_PULSETC:
 	;RES	0,A
 	;OUT	(C),A
 	;JR	FC_PULSETC2
-;FC_PULSETC1:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+;FC_PULSETC1:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	;LD	C,(IY+CFG_TC)
 	;IN	A,(C)
 	;JR	FC_PULSETC2
@@ -3016,7 +3033,7 @@ FC_MOTORON2:	; ZETA, DIO3
 	LD	HL,FST_DOR		; POINT TO FDC_DOR
 	SET	1,(HL)
 	JR	FC_MOTORON5
-FC_MOTORON3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FC_MOTORON3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	HL,FST_DOR		; POINT TO FDC_DOR
 	LD	A,(HL)			; START WITH CURRENT DOR
 	AND	11111100B		; GET RID OF ANY ACTIVE DS BITS
@@ -3080,7 +3097,7 @@ FC_MOTOROFF2:	; ZETA, DIO3
 	LD	HL,FST_DOR		; POINT TO FDC_DOR
 	RES	1,(HL)
 	JR	FC_MOTOROFF5
-FC_MOTOROFF3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC
+FC_MOTOROFF3:	; DIDE, N8, ZETA2, RCWDC, SMZ80, DYNO, EPFDC, MBC, DUO
 	LD	HL,FST_DOR		; POINT TO FDC_DOR
 	LD	A,DORC_INIT
 	LD	(HL),A
@@ -3950,7 +3967,7 @@ DORB_BR500	.EQU	10100000B	; 500KBPS
 ;
 DORB_INIT	.EQU	DORB_BR250
 ;
-; *** DIDE/N8/ZETA2/RCWDC/SMZ80/DYNO/EPFDC/MBC ***
+; *** DIDE/N8/ZETA2/RCWDC/SMZ80/DYNO/EPFDC/MBC/DUO ***
 ;
 DORC_INIT	.EQU	00001100B	; SOFT RESET INACTIVE, DMA ENABLED
 ;

Source/Apps/FDU/fdu.doc

@@ -1,14 +1,15 @@
 ================================================================
-Floppy Disk Utility (FDU) v5.3 for RetroBrew Computers 
-Disk IO / Zeta / Dual-IDE / N8 / RC2014 / SmallZ80 / Dyno
+Floppy Disk Utility (FDU) v5.9 for RetroBrew Computers 
+Disk IO / Zeta / Dual-IDE / N8 / RCBus / SmallZ80 / Dyno / Nhyodyne / Duodyne
 ================================================================
 
-Updated January 5, 2020
+Updated December 12, 2023
 by Wayne Warthen (wwarthen@gmail.com)
 
 Application to test the hardware functionality of the Floppy 
 Disk Controller (FDC) on the ECB DISK I/O, DISK I/O V3, ZETA 
-SBC, Dual IDE w/ Floppy, or N8 board.
+SBC, Dual IDE w/ Floppy, N8, RCBus, SmallZ80, Dyno, Nhyodyne,
+Duodyne systems.
  
 The intent is to provide a testbed that allows direct testing 
 of all possible media types and modes of access.  The 
@@ -33,7 +34,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,12 +75,13 @@ supported:
  - Zeta 2
  - N8
  - Mark IV
- - RC2014
+ - RCBus
  - SmallZ80
  - Dyno
- - MBC
+ - Nhyodyne (MBC)
+ - Duodyne (DUO)
 
-You must be using either a RomWBW or UBA based OS version.
+You must be using either a RomWBW or UNA based OS version.
 
 You must have one of the following floppy disk controllers:
 
@@ -89,17 +91,18 @@ 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
+ - Nhyodyne (MBC) FDC
+ - Duodyne (DUO) FDC
  
 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 +150,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 
@@ -164,8 +168,11 @@ hardwired I/O ranges are assumed in the code.
 Dyno does not have any relevant jumper settings.  The 
 hardwired I/O ranges are assumed in the code.
 
-The MBC FDC is expected to be strapped to use neither INT nor NMI.  It
-is also not expected to use DMA.
+The Nhyodyne (MBC) FDC is expected to be strapped to use neither INT
+nor NMI.  It is also not expected to use DMA.
+
+The Duodyne (DUO) FDC is expected to be strapped to use neither INT
+nor NMI.  It is also not expected to use DMA.
 
 Modes of Operation
 ------------------
@@ -506,7 +513,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
 
@@ -532,4 +539,7 @@ WW 3/24/2021: v5.7
   - Added support for a few single-sided formats
 
 WW 7/26/2021: v5.8
-  - Added support for MBC FDC
+  - Added support for Nhyodyne (MBC) FDC
+
+WW 12/10/2023: v5.9
+  - Added support for Duodyne (DUO) FDC

Source/Apps/HTalk/Build.cmd

@@ -0,0 +1,14 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+echo Building HTalk...
+tasm -t80 -g3 -fFF htalk.asm htalk.com %htalk.lst || exit /b
+
+copy /Y htalk.com ..\..\..\Binary\Apps\ || exit /b
+rem copy /Y *.ovr ..\..\..\Binary\Apps\ || exit /b
+rem copy /Y *.hlp ..\..\..\Binary\Apps\ || exit /b
+rem copy /Y *.doc ..\..\..\Binary\Apps\ || exit /b

Source/Apps/HTalk/Clean.cmd

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

Source/Apps/HTalk/Makefile

@@ -0,0 +1,10 @@
+OBJECTS = htalk.com
+#DOCS = htalk.txt
+DEST = ../../../Binary/Apps
+DOCDEST = ../../../Binary/Apps
+TOOLS = ../../../Tools
+include $(TOOLS)/Makefile.inc
+
+%.com: USETASM=1
+
+

Source/Apps/HTalk/htalk.asm

@@ -0,0 +1,725 @@
+;===============================================================================
+;HTALK - BARE MINIMUM TERMINAL INTERFACE
+;
+; CONSOLE TALKS TO ARBITRARY CHARACTER DEVICE.
+;===============================================================================
+;
+; AUTHOR: TOM PLANO (TOMPLANO@PROTON.ME)
+;
+; USAGE:
+;	HTALK $<CHAR_DEVICE_NUM>
+;
+;_______________________________________________________________________________
+;
+; CHANGE LOG:
+;			I'VE NOTATED SECTIONS OF CODE THAT ARNT REQUIRED IF THIS APP IS
+;			INCORPORATED INTO DBGMOD WITH A <OPT> TAG
+;
+;_______________________________________________________________________________
+;
+; TODO:
+; 	SEE ENUM_DEV1 TODO
+;				
+;
+;_______________________________________________________________________________
+;
+;===============================================================================
+; DEFINITIONS
+;===============================================================================
+;
+STKSIZ	.EQU	$FF
+;
+; HBIOS SYSTEM CALLS AND ID STRING ADDRESS
+; 
+ROMWBW_ID	.EQU		$FFFE	; ROMWBW ID STRING ADDRESS
+HBIOS_SYS	.EQU		$FFF0 	; HBIOS SYSCALL ADDRESS
+
+H_SYSGET	.EQU		$F8		;	GET SYSTEM INFO
+H_CIOCNT	.EQU		$00		; GET CHAR DEV COUNT SUBFUNCTION
+
+BF_CIOIN			.EQU		$00	; HBIOS CHAR INPUT 
+BF_CIOOUT			.EQU		$01	; HBIOS CHAR OUTPUT 
+BF_CIOIST			.EQU		$02	; HBIOS CHAR INPUT STATUS 
+BF_CIOOST			.EQU		$03	; HBIOS CHAR OUTPUT STATUS 
+BF_CIOINIT		.EQU		$04	; HBIOS CHAR I/O INIT 
+BF_CIOQUERY		.EQU		$05	; HBIOS CHAR I/O QUERY 
+BF_CIODEVICE	.EQU		$06	; HBIOS CHAR I/O DEVICE
+;
+; SUPPORTED HBIOS CIO DEVICE TYPES
+; 
+CIODEV_UART		.EQU		$00 ; 16C550 FAMILY SERIAL INTERFACE UART.ASM
+CIODEV_ASCI		.EQU		$10 ; Z180 BUILT-IN SERIAL PORTS ASCI.ASM
+CIODEV_TERM		.EQU		$20 ; TERMINAL ANSI.ASM
+CIODEV_PRPCON	.EQU		$30 ; PROPIO SERIAL CONSOLE INTERFACE PRP.ASM
+CIODEV_PPPCON	.EQU 		$40 ; PARPORTPROP SERIAL CONSOLE INTERFACE PPP.ASM
+CIODEV_SIO		.EQU		$50 ; ZILOG SERIAL PORT INTERFACE SIO.ASM
+CIODEV_ACIA		.EQU		$60 ; MC68B50 ASYNCHRONOUS INTERFACE ACIA.ASM
+CIODEV_PIO		.EQU		$70 ; ZILOG PARALLEL INTERFACE CONTROLLER PIO.ASM
+CIODEV_UF			.EQU		$80 ; FT232H-BASED ECB USB FIFO UF.ASM
+CIODEV_DUART	.EQU		$90 ; SCC2681 FAMILY DUAL UART DUART.ASM
+CIODEV_Z2U		.EQU		$A0 ; ZILOG Z280 BUILT-IN SERIAL PORTS Z2U.ASM
+CIODEV_LPT		.EQU		$B0 ; PARALLEL I/O CONTROLLER LPT.ASM
+
+; HBIOS CURRENT CONSOLE NUMBER
+CIO_CONSOLE	.EQU	$80
+
+; SPECIAL CHARS
+CTRLC			.EQU	$03
+CHR_BEL		.EQU	$07
+CHR_CR		.EQU	$0D
+CHR_LF		.EQU	$0A
+CHR_BS		.EQU	$08
+CHR_ESC		.EQU	$1B
+CHR_DEL		.EQU	$7F
+
+;
+;===============================================================================
+; BEGIN MAIN PROGRAM 
+;===============================================================================
+;
+	.ORG	$0100
+;	
+; SETUP STACK (SAVE OLD VALUE)
+;	<OPT> HANDLED BY DBGMON	
+	LD		(STKSAV),SP
+	LD		SP,STACK
+	
+
+;
+; INITIALIZATION + STARTUP MESSAGE + HBIOS DETECT
+;	<OPT> HANDLED BY DBGMON	
+	CALL INIT_PROG
+	JP NZ,EXIT
+;
+; LIST HBIOS DEV OPTIONS FOR REFERENCE
+; ALSO GETS MAX CONN
+;	
+;	<OPT> THIS IS OPTIONAL BECAUSE IF A CHAR DEVICE DOESNT EXIST, WE NEVER READ OR
+; WRITE TO IT, WE SIMPLY CALL CIOIST AND CIOOST OVER AND OVER ON IT, WITHOUT
+;	EVER PUSHING DATA TO IT
+	CALL	ENUM_DEV
+	JP NZ,EXIT
+;
+; PARSE COMMAND LINE 
+;
+ 	CALL	PARSE		
+	JP NZ,EXIT
+;
+; RUN CONVERSTION WITH CHAR DEVICE
+;
+	CALL 	TALK
+;
+;  DONE
+	JP		EXIT
+
+
+;
+; CLEAN UP AND RETURN TO CALLING PROCESS
+;
+EXIT:	
+	CALL 	NEWLINE						; ...
+	LD		HL,STR_EXITMSG	; LOAD EXIT STRING
+	CALL	PRTSTR					;	PRINT IT
+	CALL 	NEWLINE						; ...
+	LD		SP,(STKSAV)			; RESET STACK
+	RET										; RETURN TO CALLER
+	
+
+;
+;===============================================================================
+; END MAIN PROGRAM 
+;===============================================================================
+;
+
+;
+;===============================================================================
+; BEGIN MAIN PROGRAM SUBROUTINES
+;===============================================================================
+;
+	
+INIT_PROG:
+	LD		HL, STR_BANNER 	; LOAD WELCOME BANNER
+	CALL	PRTSTR					;	PRINT IT
+	CALL 	NEWLINE					;	...
+	LD		HL,(ROMWBW_ID) 	; GET FIRST BYTE OF ROMWBW MARKER
+	LD		A,(HL)					;	... THROUGH HL 
+	CP		'W'							; MATCH?
+	JP		NZ,NOTHBIOS			; ABORT WITH INVALID CONFIG BLOCK
+	INC		HL							; NEXT BYTE (MARKER BYTE 2)
+	LD		A,(HL)					; LOAD IT
+	CP		~'W'						; MATCH?
+	JP		NZ,NOTHBIOS			; ABORT WITH INVALID CONFIG BLOCK
+	LD		HL,STR_HBIOS		; POINT TO HBIOS STR
+	CALL	PRTSTR					; PRINT IT
+	CALL 	NEWLINE					; ...
+	RET
+;
+;	HBOIS NOT DETECTED, BAIL OUT W/ ERROR
+;
+NOTHBIOS:
+	LD		HL,STR_BIOERR		; LOAD HBIOS NOT FOUND STR
+	CALL	PRTSTR					; PRINT IT
+	CALL 	NEWLINE					; ...
+	AND 	$FF							; SET FLAGS
+	RET
+
+ENUM_DEV:
+;
+; CHAR COUNT HEADER
+;
+	LD 		HL,STR_DEVS_FOUND
+	CALL 	PRTSTR
+;
+;GET COUNT OF CHAR UNITS
+;
+	LD 		B,H_SYSGET			; LOAD SYSGET HBIOS FUNCTION
+	LD		C,H_CIOCNT			; LOAD SYSGET CHAR DEV COUNT SUBFUNCTION
+	CALL 	HBIOS_SYS				; JUMP TO HBIOS
+	OR		A								; SET FLAGS
+	JP 		NZ, EXIT				; JUMP TO EXIT ON FAILED
+	LD 		A,E							;	NUM CHAR DEVICES NOW IN A
+
+	DEC 	A								; DEC NUM DEVICES TO BE	0 INDEXED
+	LD		(CIODEV_CNT), A	; STORE BEFORE PRINT 
+	LD		(CIODEV_MAX), A	; STORE BEFORE PRINT 
+	INC A									; RESTORE NUM DEVICES VALUE
+
+	CALL 	PRTHEX 					; PRINT NUMBER OF UNITS FOUND
+	CALL 	NEWLINE						; ...
+
+ENUM_DEV1:
+
+	LD 		IX, TGT_DEV				
+; TODO: H AND L DONT ALWAYS GET SET BY THE DRIVERS. FIND SOME WAY TO MASK
+; THEM OUT IF THEY ARE THE SAME BEFORE AND AFTER THE CALL?
+	LD 		B, BF_CIODEVICE		; LOAD HBIOS FUNCTION TO QUERRY DEVICE INFO
+	LD		HL, CIODEV_CNT		; REQUEST A CHAR DEVICE
+	LD		C, (HL)						; ...
+	LD		(IX), C						; REMEMBER WHAT DEVICE WE ASKED FOR BEFORE BE
+	CALL	HBIOS_SYS					; EXECUTE HBIOS SUBROUTINE
+	OR		A									; SET FLAGS
+	RET NZ									; RETURN FAILED
+;
+;	STORE RESULTS OF HBOIS DEVICE QUERRY
+;
+  LD 		A,C								; MOVE C TO A
+	LD		(IX+1),	A					; STORE A DEVICE ATTRIBUTES, SKIP FIRST ENTRY
+	LD		A,D
+	LD		(IX+2),	A
+	LD		A,E
+	LD		(IX+3),	A
+	LD		A,H
+	LD		(IX+4),	A
+	LD		A,L
+	LD		(IX+5),	A
+;
+;	PRINT FORMATED DATA LOOP 
+;
+	LD 		B, $06 					;	PRINT THE 5 ELEMENTS OF DEV_STR_TBL
+	LD		HL,DEV_STR_TBL	; TABLE BASE PTR
+
+PLOOP_BASE:
+	CALL 	PRTSTR					; PTRSTR INCREMENTS HL FOR US
+	LD		A, (IX)
+	CALL 	PRTHEX
+	LD		A, '|'
+	CALL 	COUT
+	INC 	IX
+	DJNZ	PLOOP_BASE
+
+	CALL NEWLINE
+
+	LD A, (CIODEV_CNT) 
+	DEC A
+	LD		(CIODEV_CNT), A
+	JP P,	ENUM_DEV1 ; JUMP WHILE CIODEV_CNT >=0
+	AND $00
+	RET
+
+
+;
+; RUN CONVERSTION WITH CHAR DEVICE
+;
+TALK:	
+;
+; INIT PING PONG DEVICE POINTERS 
+;
+	LD 		IX,	USER_CON 	; LOAD VALUE AT ADDR USER_CON
+	LD 		A, (IX) 			; LOAD VALUE AT ADDR USER_CON
+	LD		(RF_DEV), A		; STORE TO ADDR RF_DEV
+	LD		A, (IX+1)			;	LOAD VALUE AT ADDR TARGET_CON
+	LD		(WT_DEV), A		;	STORE TO ADDR WT_DEV
+;
+; READ FROM RF_DEV -> WRITE TO WT_DEV
+;
+TALK_LOOP:
+;
+; CHECK FOR DATA ON RF_DEV
+;
+	LD		B,BF_CIOIST		; SET HBIOS FUNCTION TO RUN
+	LD		HL, RF_DEV
+	LD		C,(HL)		
+	CALL	HBIOS_SYS			; CHECK FOR CHAR PENDING ON INPUT BUFFER USING HBIOS
+	OR		A							;	SET FLAGS	 
+	JP		Z,TALK_NEXT		; JUMP NO CHARACTERS  READY 
+	JP		M,TALK_NEXT		;	JUMP ERROR ON READ 	
+;
+; EXEC READ FROM RF_DEV 
+;
+	LD		B,BF_CIOIN			; SET FUNCTION TO RUN
+	LD		HL, RF_DEV
+	LD		C,(HL)				; RETRIEVE CON_DEV_NUM TO READ/WRITE FROM ACTIVE CONSOLE
+	CALL	HBIOS_SYS			; CHECK FOR CHAR PENDING USING HBIOS
+	LD 		A,E						; MOVE RESULT TO A
+	CP		CTRLC					; CHECK FOR EXIT REQUEST (CTRL+C)
+	RET		Z							; IF SO, BAIL OUT
+	PUSH	AF						; SAVE THE CHAR WE READ
+;
+; CHECK FOR SPACE ON WT_DEV
+;
+	LD		B,BF_CIOOST		; SET HBIOS FUNCTION TO RUN
+	LD		HL, WT_DEV
+	LD		C,(HL)	
+	CALL	HBIOS_SYS			; CHECK FOR SPACE IN OUTPUT BUFFER USING HBIOS
+	
+	OR		A							; 0 OR 1 IS A VALID RETURN 
+	JP		Z,TALK_NEXT		;	JUMP  NO SPACE
+	JP		M,TALK_NEXT		; JUMP 	ERROR ON WRITE 
+;
+; EXEC WRITE TO WT_DEV
+;
+	LD		B,BF_CIOOUT		; SET HBIOS FUNCTION TO RUN
+	LD		HL, WT_DEV
+	LD		C,(HL)				; RETRIEVE TGT_DEV_NUM TO READ/WRITE FROM TARGET CHAR DEVICE
+	;
+	POP		AF						; RECOVER THE CHARACTER
+	LD		E,A						; MOVE CHARACTER TO E
+	CALL	HBIOS_SYS			; WRITE CHAR USING HBIOS
+
+TALK_NEXT:
+;
+; SWAP RF_DEV  AND WT_DEV
+;
+	LD 		IX,	RF_DEV	 	; LOAD VALUE AT ADDR USER_CON
+	LD 		A, (IX)				; LOAD VALUE AT ADDR RF_DEV
+	LD 		B, (IX+1) 		; LOAD VALUE AT ADDR WT_DEV
+	LD		(IX+1), A			;	STORE TO OLD RF_DEV TO  ADDR WT_DEV
+	LD		A, B					;	MOVE OLD WT_DEV TO A 
+	LD		(IX), A				;	STORE TO OLD WT_DEF TO  ADDR RF_DEV
+	JP		TALK_LOOP			; LOOP
+
+;
+;===============================================================================
+; END MAIN PROGRAM SUBROUTINES
+;===============================================================================
+;
+
+;
+;===============================================================================
+; BEGIN ROUTINES THAT ARE NOT COMPATIBLE WITH DBGMON
+;===============================================================================
+;
+
+
+PARSE:
+;
+	LD		HL,$81					; POINT TO START OF COMMAND TAIL (AFTER LENGTH BYTE)
+	CALL	NONBLANK				; SKIP LEADING BLANKS, 
+	CALL	HEXBYTE 
+	JP		C,ERRHEXRD			; IF NOT, ERR
+  LD		(TARGET_CON),A	; REQUESTED TARGET CONN 
+	
+	LD		B,A	; MOVE  TO B							
+
+	LD		HL,CIODEV_MAX		; GRAB MAX VALUE OF TARGETCON
+	LD		A,(HL)
+
+	CP		B								; CHECK IF B<=A
+	JP		M, 	ERROOR				; IF B>A,  and both are less then 80 then S SET, ERR
+	JP		C,	ERROOR        ; IF B> 80 carry set instead (signed numbers problem)
+	; swap A and B
+
+	JP		PE, ERROOR					; IF B>A, C SET, ERR
+
+	LD	HL, MSGTALKING		; PRINT TARGET DEVICE
+	CALL PRTSTR
+	LD A, B								; RETRIEVE TARGET CON
+	CALL PRTHEX
+	CALL  NEWLINE
+	
+	AND $00
+	RET
+
+
+
+;
+;NOT COMPATIBLE WITH THE DBGMON FUNCTION OF THE SAME NAME
+;
+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
+
+;
+;
+;===============================================================================
+; END ROUTINES THAT ARE NOT COMPATIBLE WITH DBGMON
+;===============================================================================
+;
+
+
+
+
+;
+;===============================================================================
+; BEGIN ROUTINES THAT ARE LIFTED FROM  DBGMON
+;===============================================================================
+;
+
+
+;
+;	PRINT THE VALUE IN A IN HEX WITHOUT DESTROYING ANY REGISTERS
+;
+PRTHEX:
+	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	COUT			; PRINT IT
+	LD	A,E					; GET THE LOW ORDER HEX CHAR
+	CALL	COUT			; PRINT IT
+	POP	DE					; RESTORE DE
+	RET							; DONE
+
+;
+; 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
+;
+
+
+;
+; 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
+
+
+;
+;__________________________________________________________________________________________________
+;
+; UTILITY PROCS TO PRINT SINGLE CHARACTERS WITHOUT TRASHING ANY REGISTERS
+;
+;__________________________________________________________________________________________________
+;
+PC_SPACE:
+	PUSH	AF
+	LD	A,' '
+	JR	PC_PRTCHR
+PC_COLON:
+	PUSH	AF
+	LD	A,':'
+	JR	PC_PRTCHR
+PC_CR:
+	PUSH	AF
+	LD	A,CHR_CR
+	JR	PC_PRTCHR
+
+PC_LF:
+	PUSH	AF
+	LD	A,CHR_LF
+	JR	PC_PRTCHR
+
+PC_PRTCHR:
+	CALL	COUT
+	POP	AF
+	RET
+
+NEWLINE2:
+	CALL	NEWLINE
+NEWLINE:
+	CALL	PC_CR
+	CALL	PC_LF
+	RET
+
+PRTSTR:
+	LD	A,(HL)
+	INC	HL
+	CP	'$'
+	RET	Z
+	CALL	COUT
+	JR	PRTSTR
+
+;
+;__COUT_______________________________________________________________________
+;
+;	OUTPUT CHARACTER FROM A
+;_____________________________________________________________________________
+;
+COUT:
+	; SAVE ALL INCOMING REGISTERS
+	PUSH	AF
+	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+;
+	; OUTPUT CHARACTER TO CONSOLE VIA HBIOS
+	LD	E,A							; OUTPUT CHAR TO E
+	LD	C,CIO_CONSOLE		; CONSOLE UNIT TO C
+	LD	B,BF_CIOOUT			; HBIOS FUNC: OUTPUT CHAR
+	CALL	HBIOS_SYS			; HBIOS OUTPUTS CHARACTER
+;
+	; RESTORE ALL REGISTERS
+	POP	HL
+	POP	DE
+	POP	BC
+	POP	AF
+	RET
+;
+;__CIN________________________________________________________________________
+;
+;	INPUT CHARACTER TO A
+;_____________________________________________________________________________
+;
+CIN:
+	; SAVE INCOMING REGISTERS (AF IS OUTPUT)
+	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+;
+	; INPUT CHARACTER FROM CONSOLE VIA HBIOS
+	LD	C,CIO_CONSOLE	; CONSOLE UNIT TO C
+	LD	B,BF_CIOIN		; HBIOS FUNC: INPUT CHAR
+	CALL	HBIOS_SYS		; HBIOS READS CHARACTER
+	LD	A,E						; MOVE CHARACTER TO A FOR RETURN
+;
+	; RESTORE REGISTERS (AF IS OUTPUT)
+	POP	HL
+	POP	DE
+	POP	BC
+	RET
+;
+;__CST________________________________________________________________________
+;
+;	RETURN INPUT STATUS IN A (0 = NO CHAR, !=0 CHAR WAITING)
+;_____________________________________________________________________________
+;
+CST:
+	; SAVE INCOMING REGISTERS (AF IS OUTPUT)
+	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+;
+	; GET CONSOLE INPUT STATUS VIA HBIOS
+	LD	C,CIO_CONSOLE		; CONSOLE UNIT TO C
+	LD	B,BF_CIOIST			; HBIOS FUNC: INPUT STATUS
+	CALL	HBIOS_SYS			; HBIOS RETURNS STATUS IN A
+;
+	; RESTORE REGISTERS (AF IS OUTPUT)
+	POP	HL
+	POP	DE
+	POP	BC
+	RET
+;
+
+
+;
+;__ISHEX______________________________________________________________________
+;
+;	CHECK BYTE AT (HL) FOR HEX CHAR, RET Z IF SO, ELSE NZ
+;_____________________________________________________________________________
+;
+ISHEX:
+	LD	A,(HL)			; CHAR TO AS
+	CP	'0'					; < '0'?
+	JR	C,ISHEX1		; YES, NOT 0-9, CHECK A-F
+	CP	'9' + 1			; > '9'
+	JR	NC,ISHEX1		; YES, NOT 0-9, CHECK A-F
+	XOR	A						; MUST BE 0-9, SET ZF
+	RET							; AND DONE
+ISHEX1:
+	CP	'A'					; < 'A'?
+	JR	C,ISHEX2		; YES, NOT A-F, FAIL
+	CP	'F' + 1			; > 'F'
+	JR	NC,ISHEX2		; YES, NOT A-F, FAIL
+	XOR	A						; MUST BE A-F, SET ZF
+	RET							; AND DONE
+ISHEX2:
+	OR	$FF					; CLEAR ZF
+	RET							; AND DONE
+;
+;__HEXBYTE____________________________________________________________________
+;
+;	GET ONE BYTE OF HEX DATA FROM BUFFER IN HL, RETURN IN A
+;_____________________________________________________________________________
+;
+HEXBYTE:
+	LD	C,0					; INIT WORKING VALUE
+HEXBYTE1:
+	CALL	ISHEX			; DO WE HAVE A HEX CHAR?
+	JR	NZ,HEXBYTE3	; IF NOT, WE ARE DONE
+	LD	B,4					; SHIFT WORKING VALUE (C := C * 16)
+HEXBYTE2:
+	SLA	C						; SHIFT ONE BIT
+	RET	C						; RETURN W/ CF SET INDICATING OVERFLOW ERROR
+	DJNZ	HEXBYTE2	; LOOP FOR 4 BITS
+	CALL	NIBL			; CONVERT HEX CHAR TO BINARY VALUE IN A & INC HL
+	OR	C						; COMBINE WITH WORKING VALUE
+	LD	C,A					; AND PUT BACK IN WORKING VALUE
+	JR	HEXBYTE1		; DO ANOTHER CHARACTER
+HEXBYTE3:
+	LD	A,C					; WORKING VALUE TO A
+	OR	A						; CLEAR CARRY
+	RET		
+
+;
+;__NIBL_______________________________________________________________________
+;
+;	GET ONE BYTE OF HEX DATA FROM BUFFER IN HL, RETURN IN A
+;_____________________________________________________________________________
+;
+NIBL:
+	LD	A,(HL)		; GET K B. DATA
+	INC	HL				; INC KB POINTER
+	CP	40H				; TEST FOR ALPHA
+	JR	NC,ALPH
+	AND	0FH				; GET THE BITS
+	RET
+ALPH:
+	AND	0FH				; GET THE BITS
+	ADD	A,09H			; MAKE IT HEX A-F
+	RET
+
+
+;
+;===============================================================================
+; END ROUTINES THAT ARE LIFTED FROM  DBGMON
+;===============================================================================
+;
+
+
+
+
+;
+;===============================================================================
+; ERROR RESPONCES
+;===============================================================================
+;
+
+ERROOR:						; REQUESTED DEV OUT OF RANGE (SYNTAX)
+	CALL	NEWLINE
+	LD		A, 'R'
+	CALL	COUT	
+	LD 		HL,TARGET_CON
+	LD    A,(HL)
+	CALL	PRTHEX
+
+
+	LD		A, ':'
+	CALL	COUT
+	LD		A, 'M'
+	CALL	COUT
+	LD 		HL,CIODEV_MAX
+	LD    A,(HL)
+	CALL	PRTHEX
+
+	LD	HL,MSGOOR
+	JR	ERROR
+ERRHEXRD:					; COMMAND HEX READ ERROR (SYNTAX)
+	LD	HL,MSGHEXRD
+	JR	ERROR
+ERRUSE:						; COMMAND USAGE ERROR (SYNTAX)
+	LD	HL,MSGUSE
+	JR	ERROR
+ERRPRM:						; COMMAND PARAMETER ERROR (SYNTAX)
+	LD	HL,MSGPRM
+	JR	ERROR
+ERROR:						; PRINT ERROR STRING AND RETURN ERROR SIGNAL
+	CALL	NEWLINE		; PRINT NEWLINE
+	CALL	PRTSTR		; PRINT ERROR STRING
+	OR	$FF					; SIGNAL ERROR
+	RET							; DONE
+
+;===============================================================================
+; STORAGE SECTION
+;===============================================================================
+;
+
+; CHAR DEV COUNT 
+CIODEV_CNT	.DB	$0
+CIODEV_MAX	.DB	$0
+
+;TALK LOOP DATA, DEFAULT TO LOOPBACK
+USER_CON		.DB $80
+TARGET_CON	.DB $80
+
+; PING PONG POINTERS
+RF_DEV			.DB 0
+WT_DEV			.DB 0
+
+; TARGET CHARACTER DEVICE DATA
+TGT_DEV:
+	.DB	0		; HBIOS CHAR NUM
+	.DB	0		; C: DEVICE ATTRIBUTES
+	.DB	0		; D: DEVICE TYPE
+	.DB	0		; E: DEVICE NUMBER
+	.DB	0		; H: DEVICE MODE
+	.DB	0		; L: DEVICE I/O BASE ADDRESS
+
+; STRING LITERALS 
+MSGUSE			.TEXT	"USAGE: HTALK <CIO_DEV_ID>$"
+MSGPRM			.TEXT	"PARAMETER ERROR$"
+MSGOOR			.TEXT	"CIO VAL TOO LARGE$"
+MSGHEXRD		.TEXT	"HEX READ ERR$"
+MSGTALKING	.TEXT	"CONNECTING TO CHAR:$"
+
+
+DEV_STR_TBL:
+	.TEXT "CHAR:$"
+	.TEXT "ATTR:$"
+	.TEXT "TYPE:$"
+	.TEXT "NUMB:$"
+	.TEXT "MODE:$"
+	.TEXT "ADDR:$"
+
+STR_DEVS_FOUND	.TEXT "NUM CHAR DEVICES FOUND - $"
+STR_EXITMSG	.TEXT "HTALK DONE$"
+STR_BANNER	.TEXT	"HTALK V1.0 (CTRL-C TO EXIT)$"
+STR_HBIOS	.TEXT "HBIOS DETECTED$"
+STR_BIOERR	.TEXT	"*** UNKNOWN BIOS	-	BAILING OUT ***$"
+	
+STKSAV	.DW	0		; STACK POINTER SAVED AT START
+	.FILL	STKSIZ,0	; STACK
+STACK	.EQU	$		; STACK TOP
+;
+	.END

Source/Apps/Makefile

@@ -1,6 +1,6 @@
 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
+SUBDIRS = HTalk XM FDU FAT Tune Test ZMP ZMD Dev VGM cpuspd Survey
 DEST = ../../Binary/Apps
 TOOLS =../../Tools
 

Source/Apps/Survey/survey.mac

@@ -15,6 +15,13 @@
 ;
 ;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
@@ -240,20 +247,6 @@ TABS	EQU	9		; Tab columns
 ;
 	;ORG	100H
 ;
-;
-;
-	.Z80
-	LD	HL,IMGORG
-	LD	DE,START
-	LD	BC,IMGEND-IMGORG
-	LDIR
-	JP	START
-	.8080
-;
-IMGORG:
-;
-	.PHASE	8000H
-;
 START:
 	LXI	H,0			; Save stack pointer
 	DAD	SP
@@ -261,9 +254,38 @@ START:
 	LXI	SP,FINIS+64
 	CALL	TYPE			; Type initial CRLF
 	DW	CRLF,CRLF
-	DB	TAB,'*** RomWBW System Survey (Feb 2023) ***'
+	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
@@ -445,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:
@@ -492,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
@@ -545,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
@@ -555,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
 ;
@@ -572,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'
@@ -607,9 +652,6 @@ PDLY:
 	JNZ	PDLY
 ;
 	.Z80
-	; record the active bank
-	ld	a,(0ffe0h)		; get current hbios bank id
-	ld	(BANK),a		; and save it
 	; Check for Z180 CPU
 	xor	a			; assume Z80
 	ld	(IS180),a		; save it
@@ -635,6 +677,17 @@ PORTLP:
 	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:
+
 	di				; interrupts off
 	ld	a,(IS180)		; Z180?
 	or	a
@@ -679,11 +732,6 @@ pnum1b	equ	$-1
 	push	af
 ;
 rdz:
-	; Make sure correct bank is still selected!
-	push	af
-	ld	a,(BANK)
-	call	0FFF3H
-	pop	af
 ;
 	ei				; interrupts back on now
 ;
@@ -818,13 +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
-BANK:	DS	1			; saved HBIOS bank id
 IS180:	DS	1			; non-zero for Z180 CPU
+ISMPCL:	DS	1			; non-zero for N8VEM SBC MPCL
 FINIS	EQU	$			; End of program
-;
-	.DEPHASE
-;
-IMGEND:
 ;
 	END
 

Source/Apps/TEST/sound/Scales.asm

@@ -1,329 +0,0 @@
-;
-;------------------------------------------------------------------------------
-; 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/Build.cmd

@@ -24,6 +24,7 @@ pushd 2piotst && call Build || exit /b & popd
 pushd piomon && call Build || exit /b & popd
 pushd banktest && call Build || exit /b & popd
 pushd portscan && call Build || exit /b & popd
+pushd sound && call Build || exit /b & popd
 
 goto :eof
 

Source/Apps/Test/Clean.cmd

@@ -21,3 +21,4 @@ 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
+pushd sound && call Clean || exit /b 1 & popd

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 2piotst piomon banktest portscan
+OBJECTS =
+SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info 2piotst piomon banktest portscan sound
 DEST = ../../../Binary/Apps/Test
 TOOLS =../../../Tools
 

Source/Apps/Test/banktest/banktest.asm

@@ -27,11 +27,10 @@
 runloc	.equ	$C000		; Running location (upper memory required)
 stksiz	.equ	$40		; Working stack size
 ;
-rmj	.equ	3		; intended HBIOS version - major
-rmn	.equ	1		; intended HBIOS version - minor
-;
 restart	.equ	$0000		; CP/M restart vector
 ;
+#include "../../../ver.inc"
+;
 #include "../../../HBIOS/hbios.inc"
 ;
 ;===============================================================================

Source/Apps/Test/portscan/portscan.asm

@@ -27,11 +27,11 @@
 runloc	.equ	$C000		; Running location (upper memory required)
 stksiz	.equ	$40		; Working stack size
 ;
-rmj	.equ	3		; intended HBIOS version - major
-rmn	.equ	1		; intended HBIOS version - minor
-;
 restart	.equ	$0000		; CP/M restart vector
 ;
+;
+#include "../../../ver.inc"
+;
 #include "../../../HBIOS/hbios.inc"
 ;
 ;===============================================================================

Source/Apps/Test/ps2info/ps2info.asm

@@ -7,20 +7,24 @@
 ; keyboard, and mouse.
 ;
 ; WBW 2022-03-28: Add menu driven port selection
-;                 Add support for RHYOPHYRE
+;                 Add support for Rhyophyre
 ; WBW 2022-04-01: Add menu for test functions
 ; WBW 2022-04-02: Fix prtchr register saving/recovery
+; WBW 2023-10-19: Add support for Duodyne
 ;
 ;=======================================================================
 ;
 ; PS/2 Keyboard/Mouse controller port addresses (adjust as needed)
 ;
-; MBC:
+; Nhyodyne:
 iocmd_mbc	.equ	$E3	; PS/2 controller command port address
 iodat_mbc	.equ	$E2	; PS/2 controller data port address
-; RPH:
+; Rhyophyre:
 iocmd_rph	.equ	$8D	; PS/2 controller command port address
 iodat_rph	.equ	$8C	; PS/2 controller data port address
+; Duodyne:
+iocmd_duo	.equ	$4D	; PS/2 controller command port address
+iodat_duo	.equ	$4C	; PS/2 controller data port address
 ;
 cpumhz	.equ	8	; for time delay calculations (not critical)
 ;
@@ -77,10 +81,12 @@ setup1:
 	jr	z,setup1
 	call	upcase
 	call	prtchr
-	cp	'1'			; MBC
+	cp	'1'			; Nhyodyne
 	jr	z,setup_mbc
-	cp	'2'			; RHYOPHYRE
+	cp	'2'			; Rhyophyre
 	jr	z,setup_rph
+	cp	'3'			; Duodyne
+	jr	z,setup_duo
 	cp	'X'
 	jr	z,exit
 	jr	setup
@@ -101,6 +107,14 @@ setup_rph:
 	ld	de,str_rph
 	jr	setup2
 ;
+setup_duo:
+	ld	a,iocmd_duo
+	ld	(iocmd),a
+	ld	a,iodat_duo
+	ld	(iodat),a
+	ld	de,str_duo
+	jr	setup2
+;
 setup2:
 	call	prtstr
 	call	crlf2
@@ -181,6 +195,12 @@ test_kbd:
 ;
 	call	ctlr_test
 	jr	nz,test_kbd_fail
+;
+	ld	a,$20			; kbd enabled, mse disabled, no ints
+	call	ctlr_setup
+	jr	nz,test_kbd_fail
+;
+	call	ctlr_flush
 ;
 	call	test_kbd_basic
 	jr	nz,test_kbd_fail
@@ -228,9 +248,13 @@ test_mse:
 	ld	a,$10			; kbd disabled, mse enabled, no ints
 	call	ctlr_setup
 	jr	nz,test_mse_fail
+;
+	call	ctlr_flush
 ;
 	call	mse_reset
 	jr	nz,test_mse_fail
+;
+	call	ctlr_flush
 ;
 	call	mse_ident
 	jr	nz,test_mse_fail
@@ -262,15 +286,21 @@ test_kbdmse:
 	ld	a,$00			; kbd enabled, mse enabled, no ints
 	call	ctlr_setup
 	jr	nz,test_kbdmse_fail
+;
+	call	ctlr_flush
 ;
 	call	kbd_reset
 	jr	nz,test_kbdmse_fail
+;
+	call	ctlr_flush
 ;
 	ld	a,2
 	call	kbd_setsc
 ;
 	call	mse_reset
 	jr	nz,test_kbdmse_fail
+;
+	call	ctlr_flush
 ;
 	call	mse_stream
 	jr	nz,test_kbdmse_fail
@@ -290,15 +320,13 @@ test_kbdmse_fail:
 ; inventory the supported scan code sets.
 ;
 test_kbd_basic:
-	ld	a,$20			; Xlat off for this checking
-	call	ctlr_setup
-	ret	nz
-;
 	call	kbd_reset
 	ret	nz
+;
+	call	ctlr_flush
 ;
 	call	kbd_ident
-	;ret	nz
+	ret	nz
 ;
 	ld	b,3			; Loop control, 3 scan code sets
 	ld	c,1			; Current scan code number
@@ -436,6 +464,19 @@ ctlr_setup:
 	xor	a
 	ret
 ;
+; Flush incoming data buffer
+;
+ctlr_flush:
+	call	crlf2
+	ld	de,str_ctlr_flush
+	call	prtstr
+ctlr_flush1:
+	call	delay			; small delay
+	call	check_read		; data pending?
+	ret	nz			; return if nothing there
+	call	get_data_dbg		; get and discard byte
+	jr	ctlr_flush1		; loop
+;
 ; Perform a keyboard reset
 ;
 kbd_reset:
@@ -612,13 +653,17 @@ mse_reset:
 	call	crlf2
 	ld	de,str_mse_reset
 	call	prtstr
-	ld	a,$f2			; Identify mouse command
+	ld	a,$ff			; Identify mouse command
 	call	put_data_mse_dbg
 	jp	c,err_ctlr_to		; handle controller error
 	call	get_data_dbg
 	jp	c,err_ctlr_to		; handle controller error
 	cp	$fa			; Is it an ack as expected?
 	jp	nz,err_mse_reset
+	call	get_data_dbg
+	jp	c,err_ctlr_to		; handle controller error
+	cp	$aa			; Success?
+	jp	nz,err_mse_reset
 	call	crlf
 	ld	de,str_mse_reset_ok
 	call	prtstr
@@ -634,18 +679,61 @@ mse_ident:
 	ld	a,$f2			; Identify mouse command
 	call	put_data_mse_dbg
 	jp	c,err_ctlr_to		; handle controller error
+mse_ident0:
 	call	get_data_dbg
 	jp	c,err_ctlr_to		; handle controller error
+
+	;cp	$00			; extraneous?
+	;jr	z,mse_ident0		; ignore it, get another
+
 	cp	$fa			; Is it an ack as expected?
 	jp	nz,err_mse_ident
-	call	get_data_dbg
-	jp	c,err_ctlr_to		; handle controller error
+	; Now we need to receive 0-2 bytes.  There is no way to know
+	; how many are coming, so we receive bytes until there is a
+	; timeout error.  Timeout is shortened here so that we don't
+	; have to wait seconds for the routine to complete normally.
+	; A short timeout is more than sufficient here.
+	ld	ix,workbuf
+	ld	a,(timeout)		; save current timeout
 	push	af
+	ld	a,stimout		; set a short timeout
+	ld	(timeout),a
+	ld	b,8			; buf max
+	ld	c,0			; buf len
+mse_ident1:
+	push	bc
+	call	get_data_dbg
+	pop	bc
+	jr	c,mse_ident2
+	ld	(ix),a
+	inc	ix
+	inc	c
+	djnz	mse_ident1
+mse_ident2:
+	pop	af			; restore original timeout
+	ld	(timeout),a
 	call	crlf
 	ld	de,str_mse_ident_disp
 	call	prtstr
-	pop	af
-	call	prtdecb
+	ld	a,'['
+	call	prtchr
+	ld	ix,workbuf
+	ld	a,c			; bytes to print
+	or	a			; check for zero
+	jr	z,mse_ident4		; handle zero
+	ld	b,a			; setup loop counter
+	jr	mse_ident3a
+mse_ident3:
+	ld	a,','
+	call	prtchr
+mse_ident3a:
+	ld	a,(ix)
+	call	prthex
+	inc	ix
+	djnz	mse_ident3
+mse_ident4:
+	ld	a,']'
+	call	prtchr
 	xor	a
 	ret
 ;
@@ -658,8 +746,13 @@ mse_stream:
 	ld	a,$f4			; Stream packets cmd
 	call	put_data_mse_dbg
 	jp	c,err_ctlr_to		; handle controller error
+mse_stream0:
 	call	get_data_dbg
 	jp	c,err_ctlr_to		; handle controller error
+
+	;cp	$00			; extraneous?
+	;jr	z,mse_stream0		; ignore it, get another
+
 	cp	$FA			; Is it an ack as expected?
 	jp	nz,err_mse_stream
 	xor	a
@@ -1344,14 +1437,16 @@ delay1:
 ; Constants
 ;=======================================================================
 ;
-str_banner		.db	"PS/2 Keyboard/Mouse Information v0.6a, 2-Apr-2022",0
+str_banner		.db	"PS/2 Keyboard/Mouse Information v0.8, 6-Nov-2023",0
 str_hwmenu		.db	"PS/2 Controller Port Options:\r\n\r\n"
-			.db	"  1 - MBC\r\n"
-			.db	"  2 - RHYOPHYRE\r\n"
+			.db	"  1 - Nhyodyne\r\n"
+			.db	"  2 - Rhyophyre\r\n"
+			.db	"  3 - Duodyne\r\n"
 			.db	"  X - Exit Application\r\n"
 			.db	"\r\nSelection? ",0
-str_mbc			.db	"MBC",0
-str_rph			.db	"RHYOPHYRE",0
+str_mbc			.db	"Nhyodyne",0
+str_rph			.db	"Rhyophyre",0
+str_duo			.db	"Duodyne",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"
@@ -1382,6 +1477,7 @@ str_trans_off		.db	"***** Testing Keyboard with Scan Code Translation DISABLED *
 str_trans_on		.db	"***** Testing Keyboard with Scan Code Translation ENABLED *****",0
 str_basic_mse		.db	"***** Basic Mouse Tests *****",0
 str_kbdmse			.db	"***** Test All Devices Combined *****",0
+str_ctlr_flush		.db	"Flushing controller input buffer",0
 str_kbd_reset		.db	"Attempting Keyboard Reset",0
 str_kbd_reset_ok	.db	"Keyboard Reset OK",0
 str_err_kbd_reset	.db	"Keyboard Reset Failed",0

Source/Apps/Test/sound/Build.cmd

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

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

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

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	$A4		; Register seelection port address
+rdat	.equ	$A5		; Register data port address
+acr	.equ	$A2		; 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/Test/sound/printing.inc

@@ -0,0 +1,177 @@
+;
+; Print character in A without destroying any registers
+;
+PRTCHR:
+	PUSH	BC		; save registers
+	PUSH	DE
+	PUSH	HL
+	LD	E,A		; character to print in E
+	LD	C,$02		; BDOS function to output a character
+	CALL	BDOS		; do it
+	POP	HL		; restore registers
+	POP	DE
+	POP	BC
+	RET
+;
+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
+;
+PRTCR:
+;
+	; shortcut to print a carriage return 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	AF
+	PUSH	DE
+;
+PRTSTR1:
+	LD	A,(DE)		; get next char
+	OR	A
+	JR	Z,PRTSTR2
+	CALL	PRTCHR
+	INC	DE
+	JR	PRTSTR1
+;
+PRTSTR2:
+	POP	DE		; restore registers
+	POP	AF
+	RET
+;
+; 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

Source/Apps/Test/sound/sound.asm

@@ -0,0 +1,460 @@
+;
+;=======================================================================
+; RomWBW HBIOS Sound Device Test Tool (SOUND)
+;=======================================================================
+;
+; Simple utility that can exercise a sound device in RomWBW.  It can
+; play a single tone, sliding scale, or sliding volume.
+;
+; I'm not actually sure who wrote the original version of this, but I
+; suspect it was Phil Summers.
+;
+; WBW 2024-03-21: Control test function by command line
+;		  Add (T)one function
+;
+;=======================================================================
+;
+;------------------------------------------------------------------------------
+; 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
+;
+		LD	DE,TXT_BANNER
+		CALL	PRTSTR
+;
+;------------------------------------------------------------------------------
+; PARSE COMMAND LINE
+;------------------------------------------------------------------------------
+;
+		LD	HL,FCB+1		; POINT TO FCB CHARS
+		LD	B,8			; PARSE 8 CHARS
+PARSE:
+		PUSH	BC
+		LD	A,(HL)			; GET NEXT CHAR
+;
+		; IF NUMBER, SET DEVICE ID
+		CP	'0'
+		JR	C,PARSE1		; IF < 0, SKIP
+		CP	'9'+ 1
+		JR	NC,PARSE1		; IF > 9, SKIP
+		SUB	'0'			; MAKE BINARY
+		LD	(DEVICE),A		; SAVE DEVICE NUM
+		JR	PARSE2			; CONTINUE LOOP
+PARSE1:
+		; IF LETTER, SET RUN OPTION
+		CP	'A'
+		JR	C,PARSE2		; IF < A, SKIP
+		CP	'Z'+ 1
+		JR	NC,PARSE1		; IF > Z, SKIP
+		LD	(OPTION),A		; SAVE RUN OPTION
+		JR	PARSE2			; CONTINUE LOOP
+;
+PARSE2:	
+		INC	HL			; BUMP PTR
+		DJNZ	PARSE
+;
+		LD	A,(OPTION)		; GET OPTION
+		CP	' '			; HAVE OPTION?
+		JR	NZ,RUN			; IF SO, RUN
+		LD	DE,TXT_USAGE		; ELSE GET USAGE
+		CALL	PRTSTR			; AND DISPLAY IT
+		JP	EXIT			; AND GET OUT
+;
+;------------------------------------------------------------------------------
+; DISPLAY DEVICE AND NUMBER OF CHANNELS
+;------------------------------------------------------------------------------
+;
+RUN:
+		LD	DE,TXT_DEV		; DEVICE:
+		CALL	PRTSTR
+		LD	A,(DEVICE)
+		CALL	PRTDECB
+		LD	C,A			; GET DEVICE ID
+		LD	A,':'
+		CALL	PRTCHR
+;
+		LD	B,$55			; HBIOS SND QUERY
+		LD	A,(DEVICE)
+		LD	C,A
+;
+		PUSH	BC			; SAVE FUNC AND ID
+		LD	E,4			; HBIOS SNDQ DEV
+		RST	08
+		LD	A,B
+		;RRCA \ RRCA \ RRCA \ RRCA
+		LD	DE,TXT_NAME
+		CALL	PRTIDXDEA		; SHOW NAME
+;
+		LD	DE,TXT_CH
+		CALL	PRTSTR
+		POP	BC			; RESTORE FUNC AND ID
+		LD	E,1			; HBIOS SNDQ_CHCNT
+		RST	08
+		LD	A,B			; NUMBER OF CHANNELS IS IN B
+		LD	(CHANNELS),A		; SAVE IT
+		CALL	PRTDECB			; PRINT IT
+		CALL	CRLF
+;
+;------------------------------------------------------------------------------
+; LOOP THROUGH EACH CHANNEL 
+;------------------------------------------------------------------------------
+;
+		LD	A,(DEVICE)		; GET DEVICE
+		LD	C,A			; INTO C
+		PUSH	BC			; SAVE IT
+		LD	B,$50			; RESET SND DEVICE
+		RST	08			; DO IT
+		POP	BC			; RECOVER DEVICE
+		LD	B,$51			; SET VOLUME
+		LD	L,$FF			; TO MAX
+		RST	08			; DO IT
+;
+		LD	A,(CHANNELS)
+		LD	B,A			; B IS LOOP COUNTER
+		LD	C,0			; C IS CHANNEL INDEX
+;
+CH_LOOP:
+		PUSH	BC			; SAVE LOOP CTL
+		LD	A,C			; CHANNEL
+		LD	(CHANNEL),A		; TO STORAGE
+		CALL	CH_RUN			; DO CHANNEL
+		PUSH	AF
+		LD	A,(DEVICE)
+		LD	C,A
+		LD	B,50H			; RESET
+		RST	08
+		POP	AF
+		POP	BC			; RECOVER LOOP CTL
+		JR	NZ,EXIT			; HANDLE ERROR/ABORT
+		INC	C			; NEXT CHANNEL
+		DJNZ	CH_LOOP			; LOOP AS NEEDED
+;
+		LD	A,(DEVICE)		; GET DEVICE
+		LD	C,A			; TO C
+		LD	B,50H			; RESET DEVICE
+		RST	08			; DO IT
+		JR	EXIT			; DONE
+;
+CH_RUN:
+		LD	A,(OPTION)		; RUN OPTION
+		CP	'S'			; SCALES?
+		JP	Z,TST_SCALES		; IF SO, DO SCALES
+		CP	'V'			; VOLUME?
+		JP	Z,TST_VOLUME		; IF SO, DO VOLUME
+		CP	'T'			; TONE
+		JP	Z,TST_TONE		; IF SO, DO TONE
+		RET
+;
+;------------------------------------------------------------------------------
+; 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:	LD	A,(DEVICE)	; SETUP DEVICE FOR BELOW
+		LD	C,A
+;
+		LD	HL,380		; START NOTE
+		LD	(NOTE),HL	; Top of Octave 7 is 343
+
+		LD	B,51H		; VOLUME HIGH
+		LD	L,0FFH		; MAX
+		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:
+		PUSH	BC
+		LD      C, 6		; CHECK FOR KEYPRESS
+		LD      E,0FFH
+		CALL    BDOS
+		POP	BC
+		OR      A		; SET RESULT
+		RET	NZ		; RETURN IF ABORT
+
+		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
+;
+		XOR      A		; SET RESULT
+		RET
+;
+FAILMSG:	PUSH	BC
+		CALL	PRTSTR
+		CALL	CRLF
+		POP	BC
+		RET
+;
+;------------------------------------------------------------------------------
+; CONSTANT TONE ON ALL CHANNELS, SCALE VOLUME
+;------------------------------------------------------------------------------
+;
+TST_VOLUME:
+;	LD	HL,332+48		; TONE
+	LD	HL,244			; ~1000 HZ
+	LD	(NOTE),HL
+;
+	LD	DE,TXT_TSTCH		; DISPLAY CHANNEL
+	CALL	PRTSTR
+	LD	A,(CHANNEL)
+	CALL	PRTDECB
+
+	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
+
+	PUSH	BC
+	LD      C, 6			; KEYPRESS 
+        LD      E, 0FFH
+        CALL    BDOS
+	POP	BC			; RECOVER LOOP CTRL
+	OR	A			; KEY PRESSED?
+	RET	NZ			; BAIL OUT IF SO
+;
+	LD	A,(VOLUME)
+	DEC	A
+	LD	(VOLUME),A
+	JR	NZ,NEXT1
+;
+	CALL	CRLF
+;
+	RET
+;
+;------------------------------------------------------------------------------
+; 1 KHZ TONE ON CHANNEL, PLAY TILL KEYPRESS
+;------------------------------------------------------------------------------
+;
+TST_TONE:
+	LD	HL,244			; ~1000 HZ
+	LD	(NOTE),HL
+;
+	LD	DE,TXT_TSTCH		; DISPLAY CHANNEL
+	CALL	PRTSTR
+	LD	A,(CHANNEL)
+	CALL	PRTDECB
+;
+	LD	A,(DEVICE)
+	LD	C,A
+;
+	LD	B,50H		; RESET
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	LD	B,51H		; VOLUME
+	LD	A,$FF		; MAX
+	LD	L,A
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	LD	B,53H		; NOTE
+	LD	HL,(NOTE)
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+TST_TONE1:
+;
+	LD	B,54H		; PLAY
+	LD	A,(CHANNEL)
+	LD	D,A
+	PUSH	BC
+	RST	08
+	POP	BC
+;
+	;CALL	DELAY
+;
+	PUSH	BC
+	LD      C, 6			; KEYPRESS 
+        LD      E, 0FFH
+        CALL    BDOS
+	OR	A			; KEY PRESSED?
+	POP	BC
+	JR	Z,TST_TONE1
+	CALL	CRLF
+	XOR	A
+	RET				; RETURN ON KEYPRESS
+;
+;------------------------------------------------------------------------------
+; LONG DELAY
+;------------------------------------------------------------------------------
+;
+;DELAY:	LD	HL,-1
+DELAY:	LD	HL,1000
+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_BANNER	.DB	13,10,"RomWBW HBIOS Sound Tool v1.0, 21-Mar-2024",13,10,13,10,0
+TXT_USAGE	.DB	"Usage:",13,10
+		.DB	"SOUND <d><o>",13,10
+		.DB	"",13,10
+		.DB	"  <d> is number of sound device",13,10
+		.DB	"  <o> is option to run:",13,10
+		.DB	"      'T': play a 1 KHz tone on each channel until keypress",13,10
+		.DB	"      'S': play a scale of notes on each channel",13,10
+		.DB	"      'V': play a 1 KHz tone at all volumes on each channel",13,10
+		.DB	"",13,10
+		.DB	"Examples:",13,10
+		.DB	"SOUND 1T    - play a tone on all channels of sound device unit #1",13,10
+		.DB	"SOUND 0S    - play a scale on all channels of sound device unit #0",13,10,0
+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_VOL		.DB	" VOLUME: ",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
+OPTION		.DB	' '		; run scales
+NOTE		.DW	128
+VOLUME		.DB	0
+CHANNEL		.DB	0
+CHANNELS	.DB	0
+OLDSTACK        .DW     0		; original stack pointer
+                .DS     40H		; space for stack
+STACK					; top 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/tune.asm

@@ -45,6 +45,10 @@
 ;   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
+;   2024-02-23 [WBW] Include ACR value in config table
+;   2024-04-16 [WBW] Add support for NABU AY-3-8910
+;   2024-05-10 [WBW] Hack to avoid corrupting bits 6&7 of PSG R7 for NABU!
 ;_______________________________________________________________________________
 ;
 ; ToDo:
@@ -55,6 +59,7 @@
 ; Main program
 ;===============================================================================
 ;
+#include	"../../ver.inc"
 #include	"hbios.inc"
 #include	"cpm.inc"
 #include	"tune.inc"
@@ -136,11 +141,10 @@ CFGSEL:
 	; Activate card if applicable
 	CALL	SLOWIO			; Slow down I/O now
 	LD	A,(ACR)			; Get ACR port address (if any)
+	LD	C,A			; Copy to C for I/O later
 	INC	A			; $FF -> $00 & set flags
-	JR	Z,PROBE			; Skip ahead to probe if no ACR
-	DEC	A			; Restore real ACR port address
-	LD	C,A			; Put in C for I/O
-	LD	A,$FF			; Value to activate card
+	JR	Z,PROBE			; If no ACR, skip ahead
+	LD	A,(ACRVAL)		; Value to activate card
 	OUT	(C),A			; Write value to ACR
 ;
 PROBE:
@@ -300,6 +304,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
@@ -321,10 +330,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
@@ -551,81 +556,87 @@ ERR2:	; without the string
 ;
 ; CONFIG TABLE, ENTRY ORDER MATCHES HBIOS PLATFORM ID
 ;
-CFGSIZ	.EQU	8
-;
-CFGTBL:	;	PLT	RSEL	RDAT	RIN	Z180	ACR
+CFGTBL:	;	PLT	RSEL	RDAT	RIN	Z180	ACR	ACRVAL
 	;	DESC
-	.DB	$01,	$9A,	$9B,	$9A,	$FF,	$9C	; SBC W/ SCG
+	.DB	$01,	$9A,	$9B,	$9A,	$FF,	$9C,	$FF	; SBC W/ SCG
 	.DW	HWSTR_SCG
 ;
-	.DB	$04,	$9C,	$9D,	$9C,	$40,	$FF	; N8 W/ ONBOARD PSG
+CFGSIZ	.EQU	$ - CFGTBL
+;
+	.DB	$04,	$9C,	$9D,	$9C,	$40,	$FF,	$FF	; N8 W/ ONBOARD PSG
 	.DW	HWSTR_N8
 ;
-	.DB	$05,	$9A,	$9B,	$9A,	$40,	$9C	; MK4 W/ SCG
+	.DB	$05,	$9A,	$9B,	$9A,	$40,	$9C,	$FF	; MK4 W/ SCG
 	.DW	HWSTR_SCG
 ;
-	.DB	$07,	$D8,	$D0,	$D8,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB)
+	.DB	$07,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$07,	$A0,	$A1,	$A2,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB Rev 6)
+	.DB	$07,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (EB Rev 6)
 	.DW	HWSTR_RCEB6
 ;
-	.DB	$07,	$D1,	$D0,	$D0,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (MF)
+	.DB	$07,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
 ;
-	.DB	$07,	$33,	$32,	$32,	$FF,	$FF	; RCZ80 W/ LINC SOUND MODULE
+	.DB	$07,	$33,	$32,	$32,	$FF,	$FF,	$FF	; RCZ80 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
 ;
-	.DB	$08,	$68,	$60,	$68,	$C0,	$FF	; RCZ180 W/ RC SOUND MODULE (EB)
+	.DB	$08,	$68,	$60,	$68,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$08,	$A0,	$A1,	$A2,	$C0,	$FF	; RCZ180 W/ RC SOUND MODULE (EB Rev 6)
+	.DB	$08,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (EB Rev 6)
 	.DW	HWSTR_RCEB6
 ;
-	.DB	$08,	$61,	$60,	$60,	$C0,	$FF	; RCZ180 W/ RC SOUND MODULE (MF)
+	.DB	$08,	$61,	$60,	$60,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
 ;
-	.DB	$08,	$33,	$32,	$32,	$C0,	$FF	; RCZ180 W/ LINC SOUND MODULE
+	.DB	$08,	$33,	$32,	$32,	$C0,	$FF,	$FF	; RCZ180 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
 ;
-	.DB	$09,	$D8,	$D0,	$D8,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB)
+	.DB	$09,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$09,	$A0,	$A1,	$A2,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB Rev 6)
+	.DB	$09,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (EB Rev 6)
 	.DW	HWSTR_RCEB6
 ;
-	.DB	$09,	$D1,	$D0,	$D0,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (MF)
+	.DB	$09,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
 ;
-	.DB	$09,	$33,	$32,	$32,	$FF,	$FF	; EZZ80 W/ LINC SOUND MODULE
+	.DB	$09,	$33,	$32,	$32,	$FF,	$FF,	$FF	; EZZ80 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
 ;
-	.DB	$0A,	$68,	$60,	$68,	$C0,	$FF	; SCZ180 W/ RC SOUND MODULE (EB)
+	.DB	$0A,	$68,	$60,	$68,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$0A,	$A0,	$A1,	$A2,	$C0,	$FF	; SCZ180 W/ RC SOUND MODULE (EB Rev 6)
+	.DB	$0A,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (EB Rev 6)
 	.DW	HWSTR_RCEB6
 ;
-	.DB	$0A,	$61,	$60,	$60,	$C0,	$FF	; SCZ180 W/ RC SOUND MODULE (MF)
+	.DB	$0A,	$61,	$60,	$60,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
 ;
-	.DB	$0A,	$33,	$32,	$32,	$C0,	$FF	; SCZ180 W/ LINC SOUND MODULE
+	.DB	$0A,	$33,	$32,	$32,	$C0,	$FF,	$FF	; SCZ180 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
 ;
-	.DB	$0B,	$D8,	$D0,	$D8,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB)
+	.DB	$0B,	$D8,	$D0,	$D8,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB)
 	.DW	HWSTR_RCEB
 ;
-	.DB	$0B,	$A0,	$A1,	$A2,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB Rev 6)
+	.DB	$0B,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (EB Rev 6)
 	.DW	HWSTR_RCEB6
 ;
-	.DB	$0B,	$D1,	$D0,	$D0,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (MF)
+	.DB	$0B,	$D1,	$D0,	$D0,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (MF)
 	.DW	HWSTR_RCMF
 ;
-	.DB	$0B,	$33,	$32,	$32,	$FF,	$FF	; RCZ280 W/ LINC SOUND MODULE
+	.DB	$0B,	$33,	$32,	$32,	$FF,	$FF,	$FF	; RCZ280 W/ LINC SOUND MODULE
 	.DW	HWSTR_LINC
 ;
-	.DB	13,	$A0,	$A1,	$A0,	$FF,	$A2	; MBC
+	.DB	13,	$A0,	$A1,	$A0,	$FF,	$A2,	$FE	; MBC
 	.DW	HWSTR_MBC
+;
+	.DB	17,	$A4,	$A5,	$A4,	$FF,	$A6,	$FE	; DUODYNE
+	.DW	HWSTR_DUO
+;
+	.DB	22,	$41,	$40,	$40,	$FF,	$FF,	$FF	; NABU
+	.DW	HWSTR_NABU
 ;
 	.DB	$FF					; END OF TABLE MARKER
 ;
@@ -636,7 +647,8 @@ RSEL		.DB	0	; Register selection port
 RDAT		.DB	0	; Register data port
 RIN		.DB	0	; Register input port
 Z180		.DB	0	; Z180 base I/O port
-ACR		.DB	0	; Aux Ctrl Reg I/O port on SCG
+ACR		.DB	0	; Aux Ctrl Reg I/O port (ACR)
+ACRVAL		.DB	0	; ACR sound enable value
 DESC		.DW	0	; Hardware description string adr
 ;
 CURPLT		.DB	0	; Current platform id reported by HBIOS
@@ -654,8 +666,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.5, 20-Mar-2022",0
-MSGUSE		.DB	"Copyright (C) 2021, Wayne Warthen, GNU GPL v3",13,10
+MSGBAN		.DB	"Tune Player for RomWBW v3.8, 10-May-2024",0
+MSGUSE		.DB	"Copyright (C) 2024, Wayne Warthen, GNU GPL v3",13,10
 		.DB	"PTxPlayer Copyright (C) 2004-2007 S.V.Bulba",13,10
 		.DB	"MYMPlay by Marq/Lieves!Tuore",13,10,13,10
 		.DB	"Usage: TUNE <filename>.[PT2|PT3|MYM] [--hbios] [+tn|-tn]",0
@@ -674,11 +686,13 @@ 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
+HWSTR_NABU	.DB	"NABU Onboard Sound",0
 
 MSGUNSUP	.db	"MYM files not supported with HBIOS yet!\r\n", 0
 
@@ -2072,8 +2086,23 @@ LOUT	OUT (C),A
 	LD 	HL, AYREGS	; START OF VALUE LIST
 LOUT	OUT 	(C), A		; SELECT REGISTER
 	LD 	C, D		; POINT TO DATA PORT
-	OUTI			; WRITE (HL) TO DATA PORT, BUMP HL
-	LD 	C, E		; POINT TO ADDRESS PORT
+
+	; UGLINESS FOR NABU!  WE NEED TO KEEP BIT 7 = 0, AND BIT 6 = 1
+	; FOR PSG REG 7
+	CP	7		; PSG REG 7?
+	JR	NZ,LOUT1	; SKIP SPECIAL PROCESSING
+	PUSH	AF		; SAVE AF
+	LD	A,(HL)		; GET VALUE BYTE
+	AND	%00111111	; FIX BITS 6 & 7
+	OR	%01000000	; ... FOR NABU!
+	OUT	(C),A		; SEND THE FIXED VALUE
+	DEC	B		; SIMULATE THE RESET		
+	INC	HL		; ... OF OUTI
+	POP	AF		; RESTORE AF
+	JR	LOUT1A		; RESUME LOOP
+	
+LOUT1	OUTI			; WRITE (HL) TO DATA PORT, BUMP HL
+LOUT1A	LD 	C, E		; POINT TO ADDRESS PORT
 	INC 	A		; NEXT REGISTER
 	CP 	13		; REG 13?
 	JR 	NZ, LOUT	; IF NOT, LOOP
@@ -2083,6 +2112,7 @@ LOUT	OUT 	(C), A		; SELECT REGISTER
 	JP 	M, LOUT2	; IF BIT 7 SET, RETURN W/O WRITING VALUE
 	LD 	C, D		; SELECT DATA PORT
 	OUT 	(C), A		; WRITE VALUE TO REGISTER 13
+
 LOUT2	CALL 	NORMIO
 	EI
 	RET			; AND DONE
@@ -2529,8 +2559,23 @@ upsg1:	ld	hl,(psource)
 psglp:	ld	c, e		; C := RSEL
 	out	(c), a		; Select register
 	ld	c, d		; C := RDAT
-	outi			; Set register value
-	inc	a		; Next register
+	
+	; ugliness for nabu!  we need to keep bit 7 = 0, and bit 6 = 1
+	; for psg reg 7
+	cp	7		; psg reg 7?
+	jr	nz,psglp1	; if not, skip special processing
+	push	af		; save af
+	ld	a,(hl)		; get value byte
+	and	%00111111	; fix bits 6 & 7
+	or	%01000000	; ... for NABU!
+	out	(c),a		; send the fixed value
+	dec	b		; simulate the rest
+	inc	hl		; ... of outi
+	pop	af		; restore af
+	jr	psglp2		; resume loop
+
+psglp1:	outi			; Set register value
+psglp2:	inc	a		; Next register
 
         ld      bc, (3 * FRAG) - 1   ; Bytes to skip before next reg-1
         add     hl, bc		; Update HL

Source/Apps/VGM/vgmplay.txt

@@ -21,8 +21,8 @@ Supported platforms
 ===================
 
 VGM Player is currently being developed on the ROMWBW platform using the Retrobrew computers
-EBC-SBC-V2 (Z80), ECB-SCG (AY-3-8910) and ECB-VGM (YM2612 and 2xSN76489) board. 
-It can be configured to run with other hardware such as RC2014, P8X180 and nhyodyne MBC.
+EBC-SBC-V2 (Z80), ECB-SCG (AY-3-8910) and ECB-VGM (YM2612,YM2151 2xSN76489) board. 
+It can be configured to run with other hardware such as RCBus, P8X180 and nhyodyne MBC.
 
 VGM files can be very big and are limited in size by the available TPA space, which is typically 52k.
 
@@ -48,15 +48,17 @@ SHIRAKAW.VGM - SN76489+YM2612      * Jantei Monogatari: St. Shirakawa University
 ANNA.VGM     - SN76489+YM2612      - Jantei Monogatari: Anna                                      : 32K
 FIELDMAP.VGM - SN76489+YM2612      - Taikou Risshiden: Field Map: Summer                          : 8K
 ITSGAMOV.VGM - SN76489+YM2612      - Puyo Puyo Tsuu: It's Game Over!                              : 16K
-STARTDEM.VGN - 2xSN76489+AY-3-8910 * Exed Exes / Savage Bees: Start Demo ~Main BGM                : 32K
+STARTDEM.VGM - 2xSN76489+AY-3-8910 * Exed Exes / Savage Bees: Start Demo ~Main BGM                : 32K
 INCHINA.VGM  - YM2612              * Double Dragon 3: The Rosetta Stone: In China                 : 44K
-
+SURE.VGM     - YM2151              - Martial Age: Sure??                                          : 36K
+SABERDAN.VGM - YM2151              - Road Runner: Sabre Dance (Attract Mode - Stage 4)            : 28K
 * Included in disk images
 
 VGM sources
 ===========
 https://www.smspower.org/forums/15359-VGMPacksGameGearMegaCollection
 https://vgmrips.net/packs/chip/ym2612
+https://vgmrips.net/packs/chip/ym2151 
 https://project2612.org/
 
 VGM Tools
@@ -67,8 +69,8 @@ https://github.com/vgmrips/vgmtools
 References
 ==========
 http://www.primrosebank.net/computers/mtx/tools/PD/vgmplayer.zip - Paul Daniels MTX SN76489 interrupt version with embedded VGM tune.
-https://github.com/jblang/SN76489/blob/master/examples/vgmplayer.asm - J.B. Langston RC2014 polled version with file loading.
+https://github.com/jblang/SN76489/blob/master/examples/vgmplayer.asm - J.B. Langston RCBus polled version with file loading.
 https://groups.google.com/g/rc2014-z80/c/9nHnETJzGKU - Marco Maccaferri P8X180 & AY-3-8910 support
-https://github.com/electrified/rc2014-ym2151/tree/main/software/vgmplay - Ed Brindly RC2014 & YM2151 support
+https://github.com/electrified/rc2014-ym2151/tree/main/software/vgmplay - Ed Brindly RCBus & YM2151 support
 
 ROMWBW version by Phil Summers. VGM Player is still in development. The ECB-VGM is also still under development.

Source/Apps/XM/xmdm125.asm

@@ -720,12 +720,17 @@ NOBYE:	LXI	H,FCB+1		; Get primary option
 ; Send option processor
 ; Single option: "K"	- force 1k mode
 ;
-	INX	H		; Look for a 'K'
+	CALL	SNDOPC
+	CALL	SNDOPC
+	JMP	ALLSET
+SNDOPC:INX	H		; Look for an option
 	MOV	A,M
 	CPI	' '		; Is it a space?
-	JZ	ALLSET		; Then we're ready to send...
-	CPI	'K'
-	JNZ	OPTERR		; "K" is the only setable 2nd option
+	JNZ	CHKK
+	POP	PSW
+	JMP	ALLSET
+CHKK:	CPI	'K'
+	JNZ	CHK6TH		; If it's not K it should be a port number
 	LDA	MSPEED
 	CPI	MINKSP		; If less than MINKSP bps, ignore 1k
 	JC	ALLSET		; Request
@@ -733,7 +738,7 @@ NOBYE:	LXI	H,FCB+1		; Get primary option
 	STA	KFLAG		; First, force us to 1K mode
 	CALL	ILPRT
 	DB	'(1k protocol selected)',CR,LF,0
-	JMP	ALLSET		; That's it for send...
+	RET		; That's it for send...
 ;
 ; Receive option processor
 ; 3 or 4 options: "X"	- disable auto-protocol select
@@ -5789,4 +5794,4 @@ BDPTOS	EQU	83		; Print Time on System
 	 ENDIF			; BYEBDOS
 ;
 	END
-
+

Source/Apps/XM/xmhb_old.z80

@@ -4,7 +4,7 @@
 ;
 ;   Wayne Warthen - wwarthen@gmail.com
 ;
-; 2018-06-06 WBW Added support for RC2014 w/ Z180
+; 2018-06-06 WBW Added support for RCBus w/ Z180
 ; 2019-08-17 WBW Refactored and merged Phil's ECB-FIFO support
 ; 2019-08-28 WBW Refactored ASCI support
 ;
@@ -575,7 +575,7 @@ A_SPEED:
 ;=======================================================================
 ;
 ; Currently assumes the port address and ordering conventions of the
-; official RC2014 SIO module.  Will not work with others such as EZZ80
+; official RCBus SIO module.  Will not work with others such as EZZ80
 ; or ZP.
 ;
 ; SIO port constants

Source/Apps/assign.asm

@@ -30,11 +30,13 @@
 ;   2021-12-06 [WBW] Fix inverted ROM/RAM DPB mapping in buffer alloc
 ;   2022-02-28 [WBW] Use HBIOS to swap banks under CP/M 3
 ;                    Use CPM3 BDOS direct BIOS call to get DRVTBL adr
+;   2023-06-19 [WBW] Update for revised DIODEVICE API
+;   2023-09-19 [WBW] Added CHUSB & CHSD device support
+;   2023-10-13 [WBW] Fixed DPH creation to select correct DPB
 ;_______________________________________________________________________________
 ;
 ; ToDo:
-;  1) Do something to prevent assigning slices when device does not support them
-;  2) ASSIGN C: causes drive map to be reinstalled unnecessarily
+;  1) ASSIGN C: causes drive map to be reinstalled unnecessarily
 ;_______________________________________________________________________________
 ;
 ;===============================================================================
@@ -664,10 +666,10 @@ makdphwbw:	; determine appropriate dpb (WBW mode, unit number in A)
 	jr	makdph0		; jump ahead
 makdph00:	
 	ld	e,6		; assume floppy
-	cp	$10		; floppy?
+	cp	$01		; floppy?
 	jr	z,makdph0	; yes, jump ahead
 	ld	e,3		; assume ram floppy
-	cp	$20		; ram floppy?
+	cp	$02		; ram floppy?
 	jr	z,makdph0	; yes, jump ahead
 	ld	e,4		; everything else is assumed to be hard disk
 	jr	makdph0		; yes, jump ahead
@@ -1065,10 +1067,6 @@ drvmap1:	; loop through device table looking for a match
 drvmap2:	
 	; convert index to device type id
 	ld	a,c		; index to accum
-	rlca			; move it to upper nibble
-	rlca			; ...
-	rlca			; ...
-	rlca			; ...
 	ld	(device),a	; save as device id
 ;
 	; loop thru hbios units looking for device type/unit match
@@ -1308,10 +1306,6 @@ prtdev:
 	rst	08		; call hbios, D := device, E := unit
 	push	de		; save results
 	ld	a,d		; device to A
-	rrca			; isolate high nibble (device)
-	rrca			;   ...
-	rrca			;   ...
-	rrca			;   ... into low nibble
 	and	$0F		; mask out undesired bits
 	push	hl		; save HL
 	add	a,a		; multiple A by two for word table
@@ -1405,12 +1399,11 @@ chkdev:		; HBIOS variant
 	; get device/unit info
 	ld	b,$17		; hbios func: diodevice
 	ld	c,a		; unit to C
-	rst	08		; call hbios, D := device, E := unit
-	ld	a,d		; device to A
+	rst	08		; call hbios, C := device attributes
 ;
 	; check slice support
-	cp	$30		; A has device/unit, in hard disk range?
-	jr	c,chkdev1	; if not hard disk, check slice val
+	bit	5,c		; high capacity device?
+	jr	z,chkdev1	; if not high cap, check slice val
 	xor	a		; otherwise, signal OK
 	ret
 ;
@@ -1918,11 +1911,11 @@ dev06	.db	"SD",0
 dev07	.db	"PRPSD",0
 dev08	.db	"PPPSD",0
 dev09	.db	"HDSK",0
-dev10	.equ	devunk
-dev11	.equ	devunk
-dev12	.equ	devunk
-dev13	.equ	devunk
-dev14	.equ	devunk
+dev10	.db	"PPA",0
+dev11	.db	"IMM",0
+dev12	.db	"SYQ",0
+dev13	.db	"CHUSB",0
+dev14	.db	"CHSD",0
 dev15	.equ	devunk
 ;
 devcnt	.equ	10		; 10 devices defined
@@ -1943,13 +1936,13 @@ stack	.equ	$		; stack top
 ; Messages
 ;
 indent	.db	"   ",0
-msgban1	.db	"ASSIGN v1.5 for RomWBW CP/M ",0
+msgban1	.db	"ASSIGN v1.8 for RomWBW CP/M ",0
 msg22	.db	"2.2",0
 msg3	.db	"3",0
-msbban2	.db	", 28-Feb-2022",0
+msbban2	.db	", 13-Oct-2023",0
 msghb	.db	" (HBIOS Mode)",0
 msgub	.db	" (UBIOS Mode)",0
-msgban3	.db	"Copyright 2021, Wayne Warthen, GNU GPL v3",0
+msgban3	.db	"Copyright 2023, Wayne Warthen, GNU GPL v3",0
 msguse	.db	"Usage: ASSIGN D:[=[{D:|<device>[<unitnum>]:[<slicenum>]}]][,...]",13,10
 	.db	"  ex. ASSIGN           (display all active assignments)",13,10
 	.db	"      ASSIGN /?        (display version and usage)",13,10

Source/Apps/cpuspd/cpuspd.asm

@@ -10,6 +10,8 @@
 ;
 #include "../../HBIOS/hbios.inc"
 ;
+#include "../../ver.inc"
+;
 ; General operational equates (should not requre adjustment)
 ;
 stksiz		.equ	$40		; Working stack size
@@ -23,9 +25,6 @@ bdos		.equ	$0005		; BDOS invocation vector
 ;
 ident		.equ	$FFFE		; loc of RomWBW HBIOS ident ptr
 ;
-rmj		.equ	3		; intended CBIOS version - major
-rmn		.equ	1		; intended CBIOS version - minor
-;
 ;=======================================================================
 ;
 	.org	$100	; standard CP/M executable
@@ -190,7 +189,7 @@ show_spd:
 	ld	b,BF_SYSGET
 	ld	c,BF_SYSGET_CPUINFO
 	rst	08
-	jp	nz,err_not_sup
+	jp	nz,err_api
 	call	crlf2
 	push	de			; save CPU speed for now
 	push	bc			; Oscillator speed to HL
@@ -200,11 +199,19 @@ show_spd:
 	call	prtd3m			; print it
 	ld	de,str_oscspd
 	call	prtstr
+	call	crlf
+	ld	de,str_cpuspd
+	call	prtstr
+	pop	hl			; recover CPU speed
+	call	prtd3m			; print it
+	ld	de,str_mhz
+	call	prtstr
+;
 	ld	b,BF_SYSGET
 	ld	c,BF_SYSGET_CPUSPD
 	rst	08
-	jp	nz,err_not_sup
-	push	de
+	ret	nz			; no CPU speed info, done
+	push	de			; save wait states for now
 	ld	a,l
 	ld	de,str_slow
 	cp	0
@@ -217,13 +224,6 @@ show_spd:
 	jr	z,show_spd1
 	jp	err_invalid
 show_spd1:
-	call	crlf
-	call	prtstr
-	pop	bc			; recover wait states
-	pop	hl			; recover CPU speed
-	push	bc			; resave wait states
-	call	prtd3m
-	ld	de,str_cpuspd
 	call	prtstr
 	pop	hl
 	ld	a,h			; memory wait states
@@ -287,6 +287,9 @@ err_not_sup:
 err_invalid:
 	ld	de,str_err_invalid
 	jr	err_ret
+err_api:
+	ld	de,str_err_api
+	jr	err_ret
 ;
 err_ret:
 	call	crlf2
@@ -662,21 +665,24 @@ delay1:
 ; Constants
 ;=======================================================================
 ;
-str_banner		.db	"RomWBW CPU Speed Selector v0.5, 2-Feb-2022",0
+str_banner		.db	"RomWBW CPU Speed Selector v0.6, 29-Dec-2023",0
 str_spacer		.db	"  ",0
 str_oscspd		.db	" MHz Oscillator",0
-str_slow		.db	"  CPU speed is HALF (",0
-str_full		.db	"  CPU speed is FULL (",0
-str_dbl			.db	"  CPU speed is DOUBLE (",0
-str_cpuspd		.db	" MHz)",0
+str_cpuspd		.db	"  CPU speed is ",0
+str_mhz			.db	" MHz",0
+
+str_slow		.db	" (Half)",0
+str_full		.db	" (Full)",0
+str_dbl			.db	" (Double)",0
 str_memws		.db	" Memory Wait State(s)",0
 str_iows		.db	" I/O Wait State(s)",0
 str_err_una		.db	"  ERROR: UNA not supported by application",0
 str_err_inv		.db	"  ERROR: Invalid BIOS (signature missing)",0
 str_err_ver		.db	"  ERROR: Unexpected HBIOS version",0
 str_err_parm		.db	"  ERROR: Parameter error (CPUSPD /? for usage)",0
-str_err_not_sup		.db	"  ERROR: Platform or configuration not supported!",0
+str_err_not_sup		.db	"  ERROR: Platform or configuration does not support CPU speed configuration!",0
 str_err_invalid		.db	"  ERROR: Invalid configuration!",0
+str_err_api		.db	"  ERROR: HBIOS API error!",0
 str_usage		.db	"  Usage: CPUSPD <cpuspd>,<memws>,<iows>\r\n"
 			.db	"\r\n"
 			.db	"         <cpuspd>: \"Half\", \"Full\", or \"Double\"\r\n"

Source/Apps/format.asm

@@ -19,6 +19,8 @@
 ;  1) Actually implement this
 ;_______________________________________________________________________________
 ;
+#include "../ver.inc"
+;
 ;===============================================================================
 ; Definitions
 ;===============================================================================
@@ -30,9 +32,6 @@ bdos	.equ	$0005		; BDOS invocation vector
 ;;
 ;stamp	.equ	$40		; loc of RomWBW CBIOS zero page stamp
 ;
-rmj	.equ	3		; CBIOS version - major
-rmn	.equ	0		; CBIOS version - minor
-;
 ;===============================================================================
 ; Code Section
 ;===============================================================================

Source/Apps/mode.asm

@@ -37,6 +37,8 @@
 ;  1) Implement flow control settings
 ;_______________________________________________________________________________
 ;
+#include "../ver.inc"
+;
 ;===============================================================================
 ; Definitions
 ;===============================================================================
@@ -48,9 +50,6 @@ bdos	.equ	$0005		; BDOS invocation vector
 ;
 ident	.equ	$FFFE		; loc of RomWBW HBIOS ident ptr
 ;
-rmj	.equ	3		; intended CBIOS version - major
-rmn	.equ	1		; intended CBIOS version - minor
-;
 bf_cioinit	.equ	$04	; HBIOS: CIOINIT function
 bf_cioquery	.equ	$05	; HBIOS: CIOQUERY function
 bf_ciodevice	.equ	$06	; HBIOS: CIODEVICE function

Source/Apps/rtc.asm

@@ -19,7 +19,7 @@
 ;
 ;[2018/11/8] v1.2 PMS Add boot option. Code optimization.
 ;
-;[2019/06/21] v1.3 Finalized RC2014 Z180 support.
+;[2019/06/21] v1.3 Finalized RCBus Z180 support.
 ;
 ;[2019/08/11] v1.4 Support SCZ180 platform.
 ;
@@ -31,6 +31,8 @@
 ;
 ;[2022/03/27] v1.8 Support RHYOPHYRE
 ;
+;[2023/07/07] v1.9 Support DUODYNE
+;
 ; Constants
 ;
 mask_data	.EQU	%10000000	; RTC data line
@@ -41,14 +43,15 @@ mask_rst	.EQU	%00010000	; De-activate RTC reset line
 PORT_SBC	.EQU	$70		; RTC port for SBC/ZETA
 PORT_N8		.EQU	$88		; RTC port for N8
 PORT_MK4	.EQU	$8A		; RTC port for MK4
-PORT_RCZ80	.EQU	$C0		; RTC port for RC2014
-PORT_RCZ180	.EQU	$0C		; RTC port for RC2014
+PORT_RCZ80	.EQU	$C0		; RTC port for RCBus
+PORT_RCZ180	.EQU	$0C		; RTC port for RCBus
 PORT_EZZ80	.EQU	$C0		; RTC port for EZZ80 (actually does not have one!!!)
 PORT_SCZ180	.EQU	$0C		; RTC port for SCZ180
 PORT_DYNO	.EQU	$0C		; RTC port for DYNO
 PORT_RCZ280	.EQU	$C0		; RTC port for RCZ280
 PORT_MBC	.EQU	$70		; RTC port for MBC
 PORT_RPH	.EQU	$84		; RTC port for RHYOPHYRE
+PORT_DUO	.EQU	$94		; RTC port for DUODYNE
 
 
 BDOS		.EQU	5		; BDOS invocation vector
@@ -1079,61 +1082,66 @@ HINIT:
 	LD	C,PORT_SBC
 	LD	DE,PLT_SBC
 	CP	$01		; SBC
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 	CP	$02		; ZETA
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 	CP	$03		; ZETA 2
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_N8
 	LD	DE,PLT_N8
 	CP	$04		; N8
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_MK4
 	LD	DE,PLT_MK4
 	CP	$05		; Mark IV
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_RCZ80
 	LD	DE,PLT_RCZ80
-	CP	$07		; RC2014 w/ Z80
-	JR	Z,RTC_INIT2
+	CP	$07		; RCBus w/ Z80
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_RCZ180
 	LD	DE,PLT_RCZ180
-	CP	$08		; RC2014 w/ Z180
-	JR	Z,RTC_INIT2
+	CP	$08		; RCBus w/ Z180
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_EZZ80
 	LD	DE,PLT_EZZ80
 	CP	$09		; Easy Z80
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_SCZ180
 	LD	DE,PLT_SCZ180
 	CP	$0A		; SCZ180
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_DYNO
 	LD	DE,PLT_DYNO
 	CP	11		; DYNO
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_RCZ280
 	LD	DE,PLT_RCZ280
 	CP	12		; RCZ280
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_MBC
 	LD	DE,PLT_MBC
 	CP	13		; MBC
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
 ;
 	LD	C,PORT_RPH
 	LD	DE,PLT_RPH
 	CP	14		; RHYOPHYRE
-	JR	Z,RTC_INIT2
+	JP	Z,RTC_INIT2
+;
+	LD	C,PORT_DUO
+	LD	DE,PLT_DUO
+	CP	17		; DUODYNE
+	JP	Z,RTC_INIT2
 ;
 	; Unknown platform
 	LD	DE,PLTERR	; BIOS error message
@@ -1630,7 +1638,7 @@ TESTING_BIT_DELAY_OVER:
 
 RTC_HELP_MSG:
 	.DB	0Ah, 0Dh		; line feed and carriage return
-	.TEXT	"RTC: Version 1.8"
+	.TEXT	"RTC: Version 1.9"
 	.DB	0Ah, 0Dh		; line feed and carriage return
 	.TEXT	"Commands: E)xit T)ime st(A)rt S)et R)aw L)oop C)harge N)ocharge D)elay I)nit G)et P)ut B)oot W)arm-start H)elp"
 	.DB	0Ah, 0Dh		; line feed and carriage return
@@ -1752,14 +1760,15 @@ BOOTMSG		.TEXT	"\r\n\r\nRebooting...$"
 PLT_SBC		.TEXT	", SBC/Zeta RTC Latch Port 0x70\r\n$"
 PLT_N8		.TEXT	", N8 RTC Latch Port 0x88\r\n$"
 PLT_MK4		.TEXT	", Mark 4 RTC Latch Port 0x8A\r\n$"
-PLT_RCZ80	.TEXT	", RC2014 Z80 RTC Module Latch Port 0xC0\r\n$"
-PLT_RCZ180	.TEXT	", RC2014 Z180 RTC Module Latch Port 0x0C\r\n$"
+PLT_RCZ80	.TEXT	", RCBus Z80 RTC Module Latch Port 0xC0\r\n$"
+PLT_RCZ180	.TEXT	", RCBus Z180 RTC Module Latch Port 0x0C\r\n$"
 PLT_EZZ80	.TEXT	", Easy Z80 RTC Module Latch Port 0xC0\r\n$"
 PLT_SCZ180	.TEXT	", SC Z180 RTC Module Latch Port 0x0C\r\n$"
 PLT_DYNO	.TEXT	", DYNO RTC Module Latch Port 0x0C\r\n$"
-PLT_RCZ280	.TEXT	", RC2014 Z280 RTC Module Latch Port 0xC0\r\n$"
+PLT_RCZ280	.TEXT	", RCBus Z280 RTC Module Latch Port 0xC0\r\n$"
 PLT_MBC		.TEXT	", MBC RTC Latch Port 0x70\r\n$"
 PLT_RPH		.TEXT	", RHYOPHYRE RTC Latch Port 0x84\r\n$"
+PLT_DUO		.TEXT	", DUODYNE RTC Latch Port 0x70\r\n$"
 
 ;
 ; Generic FOR-NEXT loop algorithm

Source/Apps/rtchb.asm

@@ -58,7 +58,7 @@ HBC_CLKTBL:
 	.DB	02H, 00111111B, '/'
 	.DB	01H, 00011111B, '/'
 	.DB	00H, 11111111B, ' '
-	.DB	03H, 00011111B, ':'
+	.DB	03H, 00111111B, ':'
 	.DB	04H, 01111111B, ':'
 	.DB	05H, 01111111B, 00H
 ;

Source/Apps/timer.asm

@@ -25,6 +25,8 @@
 ; ToDo:
 ;_______________________________________________________________________________
 ;
+#include "../ver.inc"
+;
 ;===============================================================================
 ; Definitions
 ;===============================================================================
@@ -36,9 +38,6 @@ bdos	.equ	$0005		; BDOS invocation vector
 ;
 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
 bf_sysset	.equ	$F9	; HBIOS: SYSGET function

Source/BPBIOS/@WBW Z3ENV.txt

@@ -12,7 +12,7 @@ Operating System (DOS), and Basic I/O System (BIOS).  The CCP and DOS components
 are pre-built, relocatable binaries.  The BIOS (BPBIOS) is assembled into a relocatable
 binary by the build, then the build links together all three components to form the
 final loadable image (.IMG) file.  The linking process is performed by the custom BPBIOS
-linker (BPBUILD.COM).  In addition to linking the 3 components, BPBUILD also sets
+linker (BPBUILD.COM).  In addition to linking the 3 components, BPBUILD also
 adjusts the ZCPR environment configuration.
 
 BPBUILD is designed to be run interactively.  However, it can be started with an
@@ -24,8 +24,8 @@ running of BPBUILD.
 
 The CCP can be ZCPR 3.3 (ZCPR33?.REL), ZCPR 3.4 (Z34.REL), or ZCPR 4.1 (Z41.ZRL).  ZCPR 3.3
 uses static references to the ZCPR segments, so a custom version of it must be assembled.
-The ZCPR33 subdirectory provides a build process for doing this.  It produces a specific
-version for each of the memory segment configurations (ZCPR33T.REL & ZCPR33N.REL).
+The ZCPR33 subdirectory provides a build process for doing this.  It produces a custom
+version of ZCPR33.REL with the correct static references to the ZCPR segments.
 
 The DOS can be ZSDOS 1.1 (ZSDOS.ZRL) or ZSDOS 2.03 (ZS203.ZRL).	 These are both pre-built
 relocatable binaries.  Note that only certain version combinations of ZSDOS and ZCPR are

Source/BPBIOS/Build.cmd

@@ -3,8 +3,8 @@ setlocal
 
 pushd ZCPR33 && call Build || exit /b & popd
 
-set PATH=%PATH%;..\..\Tools\zxcc;..\..\Tools\cpmtools;
-
+set TOOLS=..\..\Tools
+set PATH=%PATH%;%TOOLS%\zxcc;%TOOLS%\cpmtools;
 set CPMDIR80=%TOOLS%/cpm/
 
 call :makebp 33
@@ -48,7 +48,8 @@ if exist bp%VER%.prn del bp%VER%.prn || exit /b
 ren bpbio-ww.prn bp%VER%.prn || exit /b
 if exist bp%VER%.err del bp%VER%.err || exit /b
 ren bpbio-ww.err bp%VER%.err || exit /b
-copy bpbio-ww.rel bp%VER%.rel || exit /b
+if exist bp%VER%.rel del bp%VER%.rel || exit /b
+ren bpbio-ww.rel bp%VER%.rel || exit /b
 
 rem pause
 

Source/BPBIOS/Makefile

@@ -1,44 +1,37 @@
 VERSIONS = \
-	33t 33tbnk \
-	33n 33nbnk \
-	34t 34tbnk \
-	34n 34nbnk \
-	41tbnk 41nbnk
+	33 33bnk \
+	33 33bnk \
+	34 34bnk \
+	34 34bnk \
+	41bnk
 
-HD0IMG = ../../Binary/hd_bp.img
 IMGFILES = $(foreach ver,$(VERSIONS),bp$(ver).img)
 DISTFILES = *.zex *.rel myterm.z3t
 
-OTHERS = zcpr33n.rel zcpr33t.rel \
-	bpbio-ww.rel bpsys.dat bpsys.bak bpbio-ww.err def-ww.lib *.img
+OTHERS = zcpr33.rel bp*.prn bp*.rel \
+	bpbio-ww.rel bpsys.dat bpsys.bak bpbio-ww.err def-ww.lib bp*.img
 
 TOOLS = ../../Tools
 
 SUBDIRS = ZCPR33
 include $(TOOLS)/Makefile.inc
 
-$(HD0IMG): $(IMGFILES)
-	if [ -f $(HD0IMG) ] ; then \
-		for f in $(IMGFILES) $(DISTFILES) ; do \
-			$(BINDIR)/cpmrm -f wbw_hd0 $(HD0IMG) 0:$$f ; \
-		done ; \
-		$(CPMCP) -f wbw_hd0 $(HD0IMG) $(IMGFILES) $(DISTFILES) 0: ; \
-	fi
-
-zcpr33n.rel zcpr33t.rel:
+zcpr33.rel:
 	(cd ZCPR33 ; make)
 
-all:: $(HD0IMG)
+all:: $(IMGFILES)
 
-clean::
-	@rm -f $(HD0IMG)
+# clean::
+# 	$(MAKE) --directory ZCPR3 clean
 
-%.img: zcpr33n.rel zcpr33t.rel
+%.img: zcpr33.rel
 	$(eval VER := $(subst .img,,$(subst bp,,$@)))
 	cp def-ww-z$(VER).lib def-ww.lib
 	rm -f bpbio-ww.rel
 	$(ZXCC) ZMAC -BPBIO-WW -/P
 	mv bpbio-ww.prn bp$(VER).prn
+	if [ -f bpbio-ww.err ] ; then mv bpbio-ww.err bp$(VER).err; fi
+	mv bpbio-ww.rel bp$(VER).rel
 	cp bp$(VER).dat bpsys.dat
 	$(ZXCC) ./bpbuild.com -bpsys.dat 0 < bpbld1.rsp
 	cp bpsys.img bpsys.dat

Source/BPBIOS/ZCPR33/Build.cmd

@@ -1,8 +1,8 @@
 @echo off
 setlocal
 
-set PATH=%PATH%;..\..\..\Tools\zxcc;..\..\..\Tools\cpmtools;
-
+set TOOLS=..\..\..\Tools
+set PATH=%PATH%;%TOOLS%\zxcc;%TOOLS%\cpmtools;
 set CPMDIR80=%TOOLS%/cpm/
 
 copy ..\z3base.lib . || exit /b

Source/BPBIOS/ZCPR33/Makefile

@@ -1,5 +1,5 @@
-OBJECTS = zcpr33n.rel zcpr33t.rel
-OTHERS = z3basen.lib z3baset.lib
+OBJECTS = zcpr33.rel
+OTHERS = z3base.lib *.prn *.rel
 TOOLS = ../../../Tools
 DEST = ..
 
@@ -7,12 +7,7 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Source/BPBIOS
 
-zcpr33t.rel: ../z3baset.lib
-	cp ../z3baset.lib z3baset.lib
-	$(ZXCC) ZMAC -zcpr33t.z80 -/P
-	rm z3baset.lib
-
-zcpr33n.rel: ../z3basen.lib
-	cp ../z3basen.lib z3basen.lib
-	$(ZXCC) ZMAC -zcpr33n.z80 -/P
-	rm z3basen.lib
+zcpr33.rel: ../z3base.lib
+	cp ../z3base.lib z3base.lib
+	$(ZXCC) ZMAC -zcpr33.z80 -/P
+	rm z3base.lib

Source/BPBIOS/bpbio-ww.z80

@@ -421,6 +421,12 @@ DRVTBL:	LD	HL,DPHTBL	; Point to DPH table
 	PAGE
 	  ENDIF		;HARDDSK
 
+	  IF  RAMDSK		; << ****** Hardware Specific ****** >>
+	INCLUDE	RAMD-WW.Z80	; << This Driver is for HBIOS >>
+
+	PAGE
+	  ENDIF		;RAMDSK
+
 
 				; << ****** Hardware Specific ****** >>
 				; <<   Enter Warm Boot routines in   >>

Source/BPBIOS/cboot-ww.z80

@@ -102,6 +102,9 @@ CBOOT:
 ; BPCNFG to configure a generic IMG file for specific Hard Drive Partitions.
 
 CBOOT0:
+	LD	BC,HBF_SYSRES_INT	; HB Func: Internal Reset
+	CALL	HBX_INVOKE		; Do it
+
 	LD	HL,BRAME	; Get end of banked RAM
 	LD	(HISAV),HL	;   and save for later use
 	  IF  HARDDSK
@@ -117,14 +120,14 @@ DYNLP:	LD	E,(HL)
 	DEC	DE		; Else back up Ptr to Driver
 	DEC	DE
 	LD	A,(DE)		; Get driver #
-;	   IF  RAMDSK
-;	DEC	A
-;	DEC	A		; Hard Disk (Driver 2)?
-;	JR	Z,ADDSIZ	; ..jump if so
-;	DEC	A		; RAM Disk (Driver 3)?
-;	   ELSE
+	   IF  RAMDSK
+	DEC	A
+	DEC	A		; Hard Disk (Driver 2)?
+	JR	Z,ADDSIZ	; ..jump if so
+	DEC	A		; RAM Disk (Driver 3)?
+	   ELSE
 	CP	2		; Hard Disk (Driver 2)?
-;	   ENDIF	; Ramdsk
+	   ENDIF	; Ramdsk
 	JR	NZ,DYNCHK	; ..jump to end if Not
 ADDSIZ:	PUSH	BC		; Save loop counter
 	PUSH	HL		;   and ptr to DPH

Source/BPBIOS/deblock.z80

@@ -268,16 +268,15 @@ MATCH:	LD	A,(SECMSK)	; Get the sector mask
 ;
 ; Modified to use HBIOS host buffer
 ;
-	; HSTBUF is always in HBIOS bank where I/O is done
-	LD	A,(TPABNK)	; TPA BANK
-	DEC	A		; HBIOS bank is one below
-	LD	C,A
+	; HSTBUF is always in HBIOS bank where I/O is actually done
+	LD	A,(HB_BNKBIOS)	; HBIOS bank id
+	LD	C,A		; Set Read Source Bank
 	  IF  BANKED
-	LD	A,(DMABNK)	; Set Read Destination Bank
+	LD	A,(DMABNK)	; Read Destination Bank
 	  ELSE
-	LD	A,(TPABNK)	; Set Read Destination Bank
+	LD	A,(TPABNK)	; Read Destination Bank
 	  ENDIF
-	LD	B,A
+	LD	B,A		; Set Read Destination Bank
 	LD	A,(READOP)	; Direction?
 	OR	A
 	JR	NZ,OKBNKS	; ..jump if read

Source/BPBIOS/def-ww-z33.lib

@@ -74,7 +74,7 @@ MORDPB	EQU	NO		; Include additional Floppy DPB Formats?
 
 ;;--- RAM Disk Section ---
 ;
-;RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
+RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
 
 ;--- Hard Disk Section ---
 
@@ -133,8 +133,8 @@ BNK1	EQU	BID_COM		;   Second TPA Bank (Common Bank)	48000H
 BNK2	EQU	BID_SYS		; System Bank (BIOS, DOS, CPR)		50000H
 BNKU	EQU	00H		; User Area Bank			58000H
 				; (set to 0 to disable)
-BNK3	EQU	BID_RAMD	; First Bank for RAM disk		60000H
-BNKM	EQU	BID_RAMM	; Maximum Bank #			F8000H
+BNK3	EQU	BID_BUF		; First Bank for RAM disk		60000H
+BNKM	EQU	BID_BUF		; Maximum Bank #			F8000H
 
 	  IF  NO	; REMOVE CODE - NOT NEEDED WITH HBIOS makes a
        			; nice resource for Z180 programing in general

Source/BPBIOS/def-ww-z33bnk.lib

@@ -74,7 +74,7 @@ MORDPB	EQU	NO		; Include additional Floppy DPB Formats?
 
 ;;--- RAM Disk Section ---
 ;
-;RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
+RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
 
 ;--- Hard Disk Section ---
 
@@ -133,8 +133,8 @@ BNK1	EQU	BID_COM		;   Second TPA Bank (Common Bank)	48000H
 BNK2	EQU	BID_SYS		; System Bank (BIOS, DOS, CPR)		50000H
 BNKU	EQU	00H		; User Area Bank			58000H
 				; (set to 0 to disable)
-BNK3	EQU	BID_RAMD	; First Bank for RAM disk		60000H
-BNKM	EQU	BID_RAMM	; Maximum Bank #			F8000H
+BNK3	EQU	BID_BUF		; First Bank for RAM disk		60000H
+BNKM	EQU	BID_BUF		; Maximum Bank #			F8000H
 
 	  IF  NO	; REMOVE CODE - NOT NEEDED WITH HBIOS makes a
        			; nice resource for Z180 programing in general

Source/BPBIOS/def-ww-z34.lib

@@ -74,7 +74,7 @@ MORDPB	EQU	NO		; Include additional Floppy DPB Formats?
 
 ;;--- RAM Disk Section ---
 ;
-;RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
+RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
 
 ;--- Hard Disk Section ---
 
@@ -133,8 +133,8 @@ BNK1	EQU	BID_COM		;   Second TPA Bank (Common Bank)	48000H
 BNK2	EQU	BID_SYS		; System Bank (BIOS, DOS, CPR)		50000H
 BNKU	EQU	00H		; User Area Bank			58000H
 				; (set to 0 to disable)
-BNK3	EQU	BID_RAMD	; First Bank for RAM disk		60000H
-BNKM	EQU	BID_RAMM	; Maximum Bank #			F8000H
+BNK3	EQU	BID_BUF		; First Bank for RAM disk		60000H
+BNKM	EQU	BID_BUF		; Maximum Bank #			F8000H
 
 	  IF  NO	; REMOVE CODE - NOT NEEDED WITH HBIOS makes a
        			; nice resource for Z180 programing in general

Source/BPBIOS/def-ww-z34bnk.lib

@@ -74,7 +74,7 @@ MORDPB	EQU	NO		; Include additional Floppy DPB Formats?
 
 ;;--- RAM Disk Section ---
 ;
-;RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
+RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
 
 ;--- Hard Disk Section ---
 
@@ -133,8 +133,8 @@ BNK1	EQU	BID_COM		;   Second TPA Bank (Common Bank)	48000H
 BNK2	EQU	BID_SYS		; System Bank (BIOS, DOS, CPR)		50000H
 BNKU	EQU	00H		; User Area Bank			58000H
 				; (set to 0 to disable)
-BNK3	EQU	BID_RAMD	; First Bank for RAM disk		60000H
-BNKM	EQU	BID_RAMM	; Maximum Bank #			F8000H
+BNK3	EQU	BID_BUF		; First Bank for RAM disk		60000H
+BNKM	EQU	BID_BUF		; Maximum Bank #			F8000H
 
 	  IF  NO	; REMOVE CODE - NOT NEEDED WITH HBIOS makes a
        			; nice resource for Z180 programing in general

Source/BPBIOS/def-ww-z41bnk.lib

@@ -74,7 +74,7 @@ MORDPB	EQU	NO		; Include additional Floppy DPB Formats?
 
 ;;--- RAM Disk Section ---
 ;
-;RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
+RAMDSK	EQU	YES		; YES = Make RAM-Disk Code, NO = No code made
 
 ;--- Hard Disk Section ---
 
@@ -133,8 +133,8 @@ BNK1	EQU	BID_COM		;   Second TPA Bank (Common Bank)	48000H
 BNK2	EQU	BID_SYS		; System Bank (BIOS, DOS, CPR)		50000H
 BNKU	EQU	00H		; User Area Bank			58000H
 				; (set to 0 to disable)
-BNK3	EQU	BID_RAMD	; First Bank for RAM disk		60000H
-BNKM	EQU	BID_RAMM	; Maximum Bank #			F8000H
+BNK3	EQU	BID_BUF		; First Bank for RAM disk		60000H
+BNKM	EQU	BID_BUF		; Maximum Bank #			F8000H
 
 	  IF  NO	; REMOVE CODE - NOT NEEDED WITH HBIOS makes a
        			; nice resource for Z180 programing in general

Source/BPBIOS/diskdefs

@@ -271,9 +271,9 @@ diskdef interak
   os 2.2
 end
 
-# RomWBW 256KB ROM (128KB reserved, 128KB ROM Disk)
+# RomWBW 128KB ROM Disk
 
-diskdef wbw_rom256
+diskdef wbw_rom128
   seclen 512
   tracks 4
   sectrk 64
@@ -284,9 +284,22 @@ diskdef wbw_rom256
   os 2.2
 end
 
-# RomWBW 512KB ROM (128KB reserved, 384KB ROM Disk)
+# RomWBW 256KB ROM Disk
 
-diskdef wbw_rom512
+diskdef wbw_rom256
+  seclen 512
+  tracks 8
+  sectrk 64
+  blocksize 2048
+  maxdir 256
+  skew 0
+  boottrk 0
+  os 2.2
+end
+
+# RomWBW 384KB ROM Disk
+
+diskdef wbw_rom384
   seclen 512
   tracks 12
   sectrk 64
@@ -297,9 +310,9 @@ diskdef wbw_rom512
   os 2.2
 end
 
-# RomWBW 1024KB ROM (128KB reserved, 896KB ROM Disk)
+# RomWBW 896KB ROM Disk
 
-diskdef wbw_rom1024
+diskdef wbw_rom896
   seclen 512
   tracks 28
   sectrk 64

Source/BPBIOS/dpbhd-ww.lib

@@ -46,7 +46,7 @@
 ; NOTE: No Skew Table needed since Hard Disk Format is locked w/No Skew 
 
 ;.....
-; Currently, BPBIOS supports 2 memory drive devices and 3 phyical hard 
+; Currently, BPBIOS supports 2 memory drive devices and 3 physical hard 
 ;	drive like devices.  BPBIOS can support seven but unfortunately
 ;	BPCNFG only supports 3 hard drive like devices and the source 
 ;	code is not available, so menu 4 is meaningless.  Devices 
@@ -64,26 +64,22 @@
 ;
 ;	Starting with ver 2.8 of HBIOS, devices are discovered at boot
 ;	time and assigned device numbers.  Since devices are tested in
-;	a certain order, the device numbers are somewhat predicably 
+;	a certain order, the device numbers are somewhat predictably 
 ;	assigned.  Memory drives are discovered first.  IDE drives are 
 ;	discovered next so that IDE Hard drives including CF cards are 
 ;	assigned device 2 and device 3 if a slave drive is supported by
 ;	the interface.  Next comes the SD drive and is assigned device 3
 ;	or 4 depending on the whether there is an ide slave drive.
-;	USB drive is assigned device 4 or 5 .  For SIMH HDSK0 is device 0
+;	USB drive is assigned device 4 or 5.  For SIMH HDSK0 is device 0
 ;	and HDSK1 is device 1.  Memory drives are now handled as LBA
 ;	devices, ie like hard drives.
 ;
 ; The following non-memory drive capacities and configurations used for 
-; the SIMH, SD and IDE drives: Slice geometry is 256, 512 byte sectors, 
-; 1 head per track and 1 with one reserved track, a block size of 4096 
-; bytes with 512 directory entries.  An equivalent geometry is 16 
-; sectors and 16 heads per track.  Internally BPBIOS uses a uniform 
-; logical organization with 64 logical records per logical track.  
-; Thus there are 16 logical tracks per physical track with 1040 
-; logical (65 physical) tracks per slice.  If all partitions are not 
-; physically present, the missing partitions can be disabled in the 
-; BPBCNFG configuration file or by hand.  Note that HBIOS uses LBA, 
+; the SIMH, SD and IDE drives: Track geometry is 16 512 byte sectors.
+; A slice is exactly 64 tracks, with 1 of the 64 tracks as a system
+; track.  There are 1024 directory entries per slice. If all partitions
+; are not physically present, the missing partitions can be disabled in
+; the BPBCNFG configuration file or by hand.  Note that HBIOS uses LBA, 
 ; Logical Block Addressing, for non-floppy drives.
 ;
 ; For SBC V1,2, ZETA, MARK IV and N8, the following non-memory partitions 
@@ -94,26 +90,26 @@
 ;	partition	Size	Blocks	Block 	Offset in
 ;			MByte		Size	logical tracks
 ;====================================================================
-;	   C		 8	 2048	4096	1*16          = 16
-;	   D		 8	 2048	4096	(1+65)*16     = 1056
-;	   E		 8	 2048	4096	(1+2*65)*16   = 2096
-;	   F		 8	 2048	4096	(1+3*65)*16   = 3136
-;	   G		 8	 2048	4096	(1+4*65)*16   = 4176
-;	   H		 8	 2048	4096	(1+5*65)*16   = 5216
-;	   I		 8	 2048	4096	(1+6*65)*16   = 6256
-;	   J		 8	 2048	4096	(1+7*65)*16   = 7296
+;	   C		 8	 2044	4096	128+(1024*0)+2 = 130
+;	   D		 8	 2044	4096	128+(1024*1)+2 = 1154
+;	   E		 8	 2044	4096	128+(1024*2)+2 = 2178
+;	   F		 8	 2044	4096	128+(1024*3)+2 = 3202
+;	   G		 8	 2044	4096	128+(1024*4)+2 = 4226
+;	   H		 8	 2044	4096	128+(1024*5)+2 = 5250
+;	   I		 8	 2044	4096	128+(1024*6)+2 = 6274
+;	   J		 8	 2044	4096	128+(1024*7)+2 = 7298
 ;
 ; These are capacities and configurations used for SD card:
 ;
 ;	partition	Size	Blocks	Block 	Offset
 ;			MByte		Size	logical tracks
 ;====================================================================
-;	   K		 8	 2048	4096	1*16          = 16
-;	   L		 8	 2048	4096	(1+65)*16     = 1056
-;	   M		 8	 2048	4096	(1+2*65)*16   = 2096
-;	   N		 8	 2048	4096	(1+3*65)*16   = 3136
+;	   K		 8	 2044	4096	128+(1024*0)+2 = 130
+;	   L		 8	 2044	4096	128+(1024*1)+2 = 1154
+;	   M		 8	 2044	4096	128+(1024*2)+2 = 2178
+;	   N		 8	 2044	4096	128+(1024*3)+2 = 3202
 ;
-; RAM drive is paritition A while ROM drive is partition B. 
+; RAM drive is partition A while ROM drive is partition B. 
 ;
 ; For example, a typical Memory drive configuration is: 
 ;
@@ -199,17 +195,17 @@ DPBROM:	DEFW	64		; Sectors/Track
 				;  even though real layout is 256 physical
 				;  sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
-HSIZ0	EQU	2048		; # of blocks in first Partition  (1024 trks)
+HSIZ0	EQU	2048 - 4	; # of blocks in first Partition  (1022 trks)
 				;	
 DPB50:	DEFW	64		; Sctrs/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
-	DEFW	HSIZ0-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1 - 4 blocks	
-	DEFB	0F0H,0		; Alloc 0,1 - 4 blocks	
+	DEFW	HSIZ0-1		; Disk Size-1
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check Size	
-	DEFW	16		; Trk Offset	
+	DEFW	128+(1024*0)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -226,17 +222,17 @@ DPB50:	DEFW	64		; Sctrs/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ1	EQU	2048		; # of blocks in Second Partition  (1024 trks)
+HSIZ1	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;		
 DPB51:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ1-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+65)*16	; Track offset	1056
+	DEFW	128+(1024*1)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -253,21 +249,21 @@ DPB51:	DEFW	64		; Scts/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ2	EQU	2048		; # of blocks in third Partition (1024 tracks)
+HSIZ2	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;	
 DPB52:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ2-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+2*65)*16	; Track offset = 2096
+	DEFW	128+(1024*2)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
-; Partition F.  HBIOS Disk 0, Slice 4
+; Partition F.  HBIOS Disk 0, Slice 3
 
 	  IF  DRV_F
 	DEFB	'HBDSK0:3 ','F'+80H ; Id - 10 bytes
@@ -280,17 +276,17 @@ DPB52:	DEFW	64		; Scts/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ3	EQU	2048		; # of blocks in Fourth Partition (1024 tracks)
+HSIZ3	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;	
 DPB53:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ3-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+3*65)*16	; Track offset = 3136
+	DEFW	128+(1024*3)+2	; Trk Offset
 	  ENDIF
 ;	
 ;.....
@@ -307,17 +303,17 @@ DPB53:	DEFW	64		; Scts/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ4	EQU	2048		; # of blocks in first Partition  (1024 trks)
+HSIZ4	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;	
 DPB54:	DEFW	64		; Sctrs/Trk	
 	DEFB	5		; Blk Shf Fctr
 	DEFB	31		; Block Mask
 	DEFB	1		; Extent Mask
 	DEFW	HSIZ4-1		; Disk Size - 1
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+4*65)*16	; Track offset = 16
+	DEFW	128+(1024*4)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -334,17 +330,17 @@ DPB54:	DEFW	64		; Sctrs/Trk
 				;   sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ5	EQU	2048		; # of blocks in Second Partition  (1024 trks)
+HSIZ5	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;		
 DPB55:	DEFW	64		; Sctrs/Trk - actually 256	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ5-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	
-	DEFB	0F0H,0		; Alloc 0,1 - 4 blocks	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check Size	
-	DEFW	(1+5*65)*16	; Trk Offset = 1056
+	DEFW	128+(1024*5)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -361,17 +357,17 @@ DPB55:	DEFW	64		; Sctrs/Trk - actually 256
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ6	EQU	2048		; # of blocks in third Partition (1024 tracks)
+HSIZ6	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;	
 DPB56:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ6-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+6*65)*16	; Track offset	= 2096
+	DEFW	128+(1024*6)+2	; Trk Offset
 	  ENDIF
 
 ;.....
@@ -388,17 +384,17 @@ DPB56:	DEFW	64		; Scts/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ7	EQU	2048		; # of blocks in Fourth Partition (1024 tracks)
+HSIZ7	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;
 DPB57:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ7-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+7*65)*16	; Track offset = 3136
+	DEFW	128+(1024*7)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -414,17 +410,18 @@ DPB57:	DEFW	64		; Scts/Trk
 				;  even though real layout is 256 physical
 				;  sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
-HSIZ8	EQU	2048		; # of blocks in first Partition  (1024 trks)
+
+HSIZ8	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;	
 DPB58:	DEFW	64		; Sctrs/Trk	
 	DEFB	5		; Blk Shf Fctr	
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ8-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1 - 4 blocks	
-	DEFB	0F0H,0		; Alloc 0,1 - 4 blocks	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check Size	
-	DEFW	16		; Trk Offset	
+	DEFW	128+(1024*0)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -441,17 +438,17 @@ DPB58:	DEFW	64		; Sctrs/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ9	EQU	2048		; # of blocks in Second Partition  (1024 trks)
+HSIZ9	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;		
 DPB59:	DEFW	64		; Scts/Trk	
 	DEFB	5		; Blk Shf Fctr
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
 	DEFW	HSIZ9-1		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+65)*16	; Track offset	1056
+	DEFW	128+(1024*1)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -468,17 +465,17 @@ DPB59:	DEFW	64		; Scts/Trk
 				; sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ10	EQU	2048		; # of blocks in Second Partition  (1024 trks)
+HSIZ10	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 				;		
 DPB60:	DEFW	64		; Scts/Trk
 	DEFB	5		; Blk Shf Fctr
 	DEFB	31		; Block Mask	
 	DEFB	1		; Extent Mask	
-	DEFW	HSIZ10		; Disk Size-1	
-	DEFW	511		; Dir Max-1	4 blocks
-	DEFB	0F0H,0		; Alloc 0,1	
+	DEFW	HSIZ10-1		; Disk Size-1	
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size	
-	DEFW	(1+2*65)*16	; Track offset	2096
+	DEFW	128+(1024*2)+2	; Trk Offset
 	  ENDIF
 ;
 ;.....
@@ -492,18 +489,17 @@ DPB60:	DEFW	64		; Scts/Trk
 	DEFB	16		; Logical Sectors per track
 	DEFB	0		; Physical tracks/side (No Meaning in HD)
 
-HSIZ11	EQU	2048		; # of blocks in Forth Logical Drive 
-				;   (1024 tracks)
+HSIZ11	EQU	2048 - 4	; # of blocks in Second Partition  (1022 trks)
 
 DPB61:	DEFW	64		; Scts/Trk
 	DEFB	5		; Blk Shf Fctr
 	DEFB	31		; Block Mask
 	DEFB	1		; Extent Mask
 	DEFW	HSIZ11-1 	; Disk Size-1
-	DEFW	511		; Dir Max-1
-	DEFB	0F0H,0		; Alloc 0,1
+	DEFW	1024-1		; Dir Max-1
+	DEFB	0FFH,0		; Alloc 0,1
 	DEFW	0		; Check size
-	DEFW	(1+3*65)*16	; Track offset	3136
+	DEFW	128+(1024*3)+2	; Trk Offset
 	  ENDIF
 		
 ;=========== End of Hard Disk DPBs ===========

Source/BPBIOS/dphhd.lib

@@ -9,10 +9,11 @@
 ; 1.0 - 31 Aug 92 - General Release.					HFB
 ; 0.1 -  3 Jan 92 - Initial release.					HFB
 ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-; The Physical Drive Number byte (XDPH+3) is simply an index to the Physical
-; Drive as specified in the ICFG-xx.Z80 file.  Up to three physical drives
-; may be defined in that section, the first byte of which defines the
-; Physical/Logical Unit Address (Device & LUN for SCSI, Master/Slave for IDE),
+; The Logical Drive Number byte (XDPH+3) is simply an index into the
+; BPBIOS physical drive table as specified in the ICFG-xx.Z80 file.
+; BPBIOS supports exactly three logical drives which
+; are defined in that section, the first byte of which defines the
+; Physical Unit (HBIOS Disk Unit)
 ; and a flag bit to specify whether or not the drive is physically present.
 ; See ICFG-xx.Z80 for a definition of the data.
 
@@ -21,7 +22,7 @@
 
 XDPH90:	DEFB	TRUE		; Format lock flag (Lock RAM Drive)
 	DEFB	FIXDSK		; Disk Drive Type
-	DEFB	2		; Driver ID = Treat as Hard Drive
+	DEFB	3		; Driver ID = Treat as Hard Drive
 	DEFB	HB_MDRAM	; Physical Drive Number
 DPH$90:	DEFW	0		; Skew Table pointer
 	DEFW	0,0,0		; Scratch area
@@ -34,7 +35,7 @@ DPH$90:	DEFW	0		; Skew Table pointer
 
 XDPH91:	DEFB	TRUE		; Format lock flag (Lock ROM Drive)
 	DEFB	FIXDSK		; Disk Drive Type
-	DEFB	2		; Driver ID = Treat as Hard Drive
+	DEFB	3		; Driver ID = Treat as Hard Drive
 	DEFB	HB_MDROM	; Physical Drive Number
 DPH$91:	DEFW	0		; Skew Table pointer
 	DEFW	0,0,0		; Scratch area
@@ -48,7 +49,7 @@ DPH$91:	DEFW	0		; Skew Table pointer
 XDPH50:	DEFB	TRUE		; Format lock flag (Lock First Hard Drive)
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$50:	DEFW	0		; Skew table pointer
 	DEFW	0,0,0		; Scratch area
 	DEFW	DIRBUF		; Directory buffer pointer
@@ -61,7 +62,7 @@ DPH$50:	DEFW	0		; Skew table pointer
 XDPH51:	DEFB	TRUE		; --- Second Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$51:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -74,7 +75,7 @@ DPH$51:	DEFW	0
 XDPH52:	DEFB	TRUE		; --- Third Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..2] for this Partition
+	DEFB	0		; Physical drive [0..2] for this Partition
 DPH$52:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -87,7 +88,7 @@ DPH$52:	DEFW	0
 XDPH53:	DEFB	TRUE		; --- Fourth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$53:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -100,7 +101,7 @@ DPH$53:	DEFW	0
 XDPH54:	DEFB	TRUE		; --- Fifth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$54:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -113,7 +114,7 @@ DPH$54:	DEFW	0
 XDPH55:	DEFB	TRUE		; --- Sixth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$55:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -126,7 +127,7 @@ DPH$55:	DEFW	0
 XDPH56:	DEFB	TRUE		; --- Seventh Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$56:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -139,7 +140,7 @@ DPH$56:	DEFW	0
 XDPH57:	DEFB	TRUE		; --- Eighth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV0	; Physical drive [0..6] for this Partition
+	DEFB	0		; Logical drive [0..2] for this Partition
 DPH$57:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -152,7 +153,7 @@ DPH$57:	DEFW	0
 XDPH58:	DEFB	TRUE		; --- Ninth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV1	; Physical drive [0..6] for this Partition
+	DEFB	1		; Logical drive [0..2] for this Partition
 DPH$58:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -165,7 +166,7 @@ DPH$58:	DEFW	0
 XDPH59:	DEFB	TRUE		; --- Tenth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV1	; Physical drive [0..6] for this Partition
+	DEFB	1		; Logical drive [0..2] for this Partition
 DPH$59:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -178,7 +179,7 @@ DPH$59:	DEFW	0
 XDPH60:	DEFB	TRUE		; --- Eleventh Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV1	; Physical drive [0..6] for this Partition
+	DEFB	1		; Logical drive [0..2] for this Partition
 DPH$60:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF
@@ -191,7 +192,7 @@ DPH$60:	DEFW	0
 XDPH61:	DEFB	TRUE		; --- Twelveth Hard Drive/Partition
 	DEFB	FIXDSK		; Disk drive type
 	DEFB	2		; Driver ID - 2=hard drive
-	DEFB	HB_HDDEV1	; Physical drive [0..6] for this Partition
+	DEFB	1		; Logical drive [0..2] for this Partition
 DPH$61:	DEFW	0
 	DEFW	0,0,0
 	DEFW	DIRBUF

Source/BPBIOS/hard-ww.z80

@@ -104,15 +104,69 @@ SELHD:	; SET DEVICE
 ;  Writes from HSTBUF using HSTTRK and HSTSEC to build Block Number.
 ; NOTE: This routine uses physical drive characteristics from ICFG-xx.
 
-HDWRIT:	
+HDWRIT:
+;	CALL	PRTSTRD
+;	DEFB	'[HD WRITE]$'
 
 	XOR	A
 	LD	(HSTWRT),A	; Show no active writes pending
-	JP	HDSK_WRITE	; ..continue
+
+	LD	B,HB_DIOWRITE	; HBIOS WRITE
+	JR	HDIO	; ..continue
 
 ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ; Read from Hard Disk Drive			< Internal BIOS Routine >
 ;  Reads to HSTBUF using HSTTRK and HSTSEC to build Block Number.
+
+HDREAD:
+;	CALL	PRTSTRD		; DEBUG
+;	DEFB	'[HD READ]$'	; DEBUG
+
+	LD	B,HB_DIOREAD	; HBIOS READ
+	JR	HDIO	; ..continue
+
+;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+; Common read/write code for hard disk
+
+HDIO:
+	LD	HL,(HSTDPH)	; GET ACTIVE DPH POINTER
+	DEC	HL		; ADJUST TO POINT TO BPBIOS LOGICAL UNIT NUMBER
+	LD	A,(HL)		; LOAD IT IN A
+;
+	; Convert logical -> physical
+	; Code below is ugly brute force approach, but since there are
+	; always exactly 3 logical drives in BPBIOS and the first one
+	; is the most commonly used, this turns out to be reasonably
+	; efficient.
+	LD	HL,HDRV0	; PERHAPS HDRV0
+	OR	A		; A == 0?
+	JR	Z,HDSK_HDIO1	; HANDLE IF SO
+	LD	HL,HDRV1	; PERHAPS HDRV1
+	DEC	A		; A == 1?
+	JR	Z,HDSK_HDIO1	; HANDLE IF SO
+	LD	HL,HDRV2	; PERHAPS HDRV2
+	DEC	A		; A == 2?
+	JR	Z,HDSK_HDIO1	; HANDLE IF SO
+	CALL	PANIC		; INVALID LOGICAL UNIT NUMBER
+HDSK_HDIO1:
+	LD	A,(HL)		; LOAD PHYS UNIT NUM (HBIOS DISK UNIT)
+	AND	0FH		; REMOVE EXTRANEOUS BITS
+	LD	C,A		; PUT IN C FOR BELOW
+	JR	HB_DSKIO
+
+	  IF  BANKED
+	COMMON	/BANK2/
+	  ELSE
+	CSEG
+	  ENDIF
+;
+;==================================================================================================
+;   HBIOS Disk Driver Interface
+;==================================================================================================
+;
+; Enter with B=HBIOS disk function code (read/write)
+;            C=HBIOS disk unit number
+;
 ; NOTE: This routine uses physical drive characteristics from ICFG-xx.
 ; The routine computes a sequential block number with the algorithm; 
 ; Trk * 16 + Sector, HBIOS uses LBA addressing for hard drive like 
@@ -127,43 +181,8 @@ HDWRIT:
 ;   Sector := (Block# MOD hdSPT)+1	(* Quotient1 := Block# DIV hdSPT *)
 ;   Head   := Quotient1 MOD hdHds	(* Quotient2 := Quotient1 DIV hdHds *)
 ;   Track  := Quotient2
-;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-HDREAD:
-	JP	HDSK_READ
-
-	  IF  BANKED
-	COMMON	/BANK2/
-	  ELSE
-	CSEG
-	  ENDIF
-;
-;==================================================================================================
-;   HBIOS Disk Driver Interface
-;==================================================================================================
-;
-; HBIOS disk commands
-;
-HB_DSKRD	EQU	13H
-HB_DSKWR	EQU	14H
-;
-HDSK_READ:
-;	CALL	PRTSTRD		; DEBUG
-;	DEFB	'[HDSK READ]$'	; DEBUG
-
-	LD	B,HB_DSKRD	; HBIOS DISK READ (13H)
-	JR	HDSK_RW
-;
-HDSK_WRITE:
-;	CALL	PRTSTRD
-;	DEFB	'[HDSK WRITE]$'
-
-	LD	B,HB_DSKWR	; HBIOS DISK WRITE (14H)
-;
-HDSK_RW:
-	LD	HL,(HSTDPH)	; GET ACTIVE DPH POINTER
-	DEC	HL		; ADJUST TO POINT TO UNIT NUMBER
-	LD	C,(HL)		; LOAD IT IN C FOR HBIOS CALL LATER
+HB_DSKIO:
 	PUSH	BC		; SAVE FUNCTION AND DEVICE FOR LATER
 	LD	HL,(HSTTRK)	; GET TRACK VALUE
 	LD	A,L		; LSB OF TRACK TO A
@@ -172,10 +191,10 @@ HDSK_RW:
 	LD	A,(HSTSEC)	; GET SECTOR
 	LD	E,A		; STUFF IT IN E
 	LD	B,4		; PREPARE TO SHIFT OUT 4 BIT HEAD VALUE
-HDSK_RW1:                       
+HB_DSKIO1:                       
 	SRL	H		; SHIFT ONE BIT OUT
 	RR	L		; ... OF HL
-	DJNZ	HDSK_RW1	; DO ALL 4 BITS
+	DJNZ	HB_DSKIO1	; DO ALL 4 BITS
 	POP	BC		; RECOVER FUNCTION AND DEVICE
 	PUSH	BC		; SAVE INCOMING FUNCTION, DEVICE/UNIT
 	LD	B,12H		; SETUP FOR NEW SEEK CALL
@@ -183,7 +202,6 @@ HDSK_RW1:
 	POP	BC              ; RESTORE INCOMING FUNCTION, DEVICE/UNIT
 	RET	NZ              ; ABORT IF SEEK RETURNED AN ERROR W/ ERROR IN A
 	LD	HL,(HB_DSKBUF)  ; GET BUFFER ADDRESS
-	;LD	D,BID_HB	; BUFFER IN HBIOS BANK
 	LD	A,(HB_BNKBIOS)	; BUFFER IN HBIOS BANK
 	LD	D,A		; PUT IN D
 	LD	E,1		; ONE SECTOR
@@ -193,17 +211,3 @@ HDSK_RW1:
 
 	OR	0FFH		; A=$FF TO SIGNAL ERROR
 	RET			; AND DONE W/ ERROR
-;
-;==================================================================================================
-;   HDSK DISK DRIVER - DATA
-;==================================================================================================
-;
-	  IF  BANKED
-	COMMON	/B2RAM/
-	  ELSE
-	DSEG
-	  ENDIF
-
-HDSK_PDN	DEFS	1		; PHYSICAL DEVICE
-
-