Application Boot Tweaks

- Reduces failure scenarios with application boot
- Catches and diagnoses common bank mismatch which application boot cannot handle

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 <!--
 BEFORE YOU CREATE A PULL REQUEST:
 
-- Please base all pull requests against the dev branch
+- 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")
 

.github/workflows/commit.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v4.1.1
 
       - name: Get Commit Ref
         run: |
@@ -36,7 +36,7 @@ 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-${{env.COMMIT_REF}}-Linux
           path: .
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v4.1.1
 
       - name: Get Commit Ref
         run: |
@@ -68,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-${{env.COMMIT_REF}}-MacOS
           path: .

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v4.1.1
 
       - name: Build
         run: |

.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/**
@@ -98,6 +99,7 @@ Tools/unix/zx/zx
 !Source/ZRC512/*.bin
 !Source/Z1RCC/*.bin
 !Source/ZZRCC/*.bin
+!Source/FZ80/*.bin
 !Tools/cpm/**
 !Tools/unix/zx/*
 !Tools/zx/*

Binary/Apps/Clean.cmd

@@ -8,5 +8,6 @@ if exist *.hlp del *.hlp
 if exist Tunes\*.pt? del Tunes\*.pt?
 if exist Tunes\*.mym del Tunes\*.mym
 if exist Tunes\*.vgm del Tunes\*.vgm
+if exist bbcbasic.txt del bbcbasic.txt
 
 pushd Test && call Clean || exit /b 1 & popd

Binary/Apps/Makefile

@@ -8,4 +8,4 @@ all::
 	mkdir -p Tunes
 
 clean::
-	@rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.ovr *.hlp *.doc *.COM *.BIN Tunes/*.mym Tunes/*.pt? Tunes/*.vgm
+	@rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.ovr *.hlp *.doc *.COM *.BIN Tunes/*.mym Tunes/*.pt? Tunes/*.vgm bbcbasic.txt

Binary/Apps/Test/inttest.doc

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

Binary/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/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

@@ -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/CPM/ReadMe.txt

@@ -0,0 +1,67 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory ("Doc/CPM") is part of the RomWBW System Software
+distribution archive.  It contains documentation for the CP/M and
+CP/M work-alike operating system components of the system.
+
+
+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
+completed as part of the RomWBW distribution.
+
+
+CPM3 Command Summary ("CPM3 Command Summary.pdf")
+CPM3 Programmer's Guide ("CPM3 Programmers Guide.pdf")
+CPM3 System Guide ("CPM3 System Guide.pdf")
+CPM3 User's Guide ("CPM3 Users Guide.pdf")
+------------------------------------------------------
+
+The original DRI CP/M 3.0 Operating System Documentation Set.  This
+should be considered the primary reference for CP/M 3 system operation.
+
+
+NZCOM User's Manual ("NZCOM Users Manual.pdf")
+----------------------------------------------
+
+NZCOM operating system operation manual.
+
+
+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.
+
+
+ZCPR Manual ("ZCPR 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.
+
+ZCPR D&J Manual ("ZCPR-DJ.doc")
+-------------------------------
+
+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.

Doc/ChangeLog.txt

@@ -1,3 +1,35 @@
+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
+- M?P: Reorganization of Doc directory introducing subfolders
+- WBW: Upgraded BBCBASIC to v5.00
+- W?S: Updated FLASH utility to v1.3.9
+- WBW: Support RCBus PS/2 Keyboard (EP/Sally)
+- M?R: Update Timer app to display output in decimal
+- WBW: Preliminary support for S100 FPGA Z80 platform
+- WBW: Added simple serial (SSER) driver
+- WBW: Added preliminary support for S100 FPGA Z80 SD Cards
+- M?R: Consolidated ROM Applications document into the Applications document
+- M?R: Reviewed and substantially improved the Applications document
+- WBW: Added support for DS1305 RTC on S100 FPGA Z80
+- WBW: Added support for Les Bird's RCBus Graphics/Sound/Joystick module
+- WBW: Added support for Les Bird's Dual 16C550 UART module
+- WBW: Refactor UART driver for more flexible configuration
+- M?R: Added hour/minute/second display to timer app
+
 Version 3.4
 -----------
 NOTE: Changes require HBIOS/CBIOS/Apps sync, version bump to 3.4 to ensure integrity
@@ -5,10 +37,39 @@ NOTE: Changes require HBIOS/CBIOS/Apps sync, version bump to 3.4 to ensure integ
 - 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
@@ -16,7 +77,7 @@ Version 3.3
 - WBW: Support per-drive floppy configuration
 - WBW: Support for Bill Shen's VGARC
 - WBW: Support for MG014 Parallel Port module + printer
-- WBW: Support for EMM Zip Drive on PPI interface (much inspiration from Alan Cox)
+- WBW: Support for 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

Doc/Contrib/ZSystem.txt

@@ -4,7 +4,7 @@ ZSDOS Adaptation Notes for RomWBW
 Wayne Warthen
 wwarthen@gmail.com
 
-This file is a log of the work done to adapt the ZSDOS distribution to the N8VEM platforms under RomWBW.  I strongly recommend reviewing the zsdos.pdf file in the Doc directory.
+This file is a log of the work done to adapt the ZSDOS distribution to the N8VEM platforms under RomWBW.  I strongly recommend reviewing the zsdos.pdf file in the Doc/CPM directory.
 
 The starting point was the general public release of ZSDOS that is generally available.  The first line of the README file is "ZSDOS-GP.  General Public Release of the ZSDOS 1.x Operating System."
 
@@ -52,4 +52,4 @@ Usage Notes
 
 6. After using PUTDS to initialize a directory for ZDS date stamping, I am finding that it is necessary to run RELOG before the stamping routines will actually start working.
 
-7. Generic CP/M PIP and ZSDOS path searching do not play well together if you use PIP to copy to or from a directory in the ZSDOS search path.  Best to use COPY from the ZSDOS distribution.
+7. Generic CP/M PIP and ZSDOS path searching do not play well together if you use PIP to copy to or from a directory in the ZSDOS search path.  Best to use COPY from the ZSDOS distribution.

Doc/Language/ReadMe.txt

@@ -0,0 +1,62 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory ("Doc/Language") is part of the RomWBW System Software
+distribution archive.  It contains documentation for Programming
+Languages provided with the system.
+
+
+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.
+
+
+Borland TurboPascal User Manual (Turbo_Pascal_Version_3.0_Reference_Manual_1986.pdf)
+------------------------------------------------------------------------------------
+
+Official user manual Borland TurboPascal included in the pascal disk image.
+
+
+Cowgol Lanaguage (Cowgol Language.pdf)
+--------------------------------------
+
+Documentation for Cowgol Language included in the cowgol 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.
+
+
+Microsoft Basic-80 Reference Manual v5.0 (Microsoft Basic-80 Reference Manual v5.0.pdf)
+---------------------------------------------------------------------------------------
+
+Official manual for Microsoft BASIC as included in RomWBW.
+
+
+Microsoft 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.
+
+
+Z80 Assembler User Manual (z80asm (SLR Systems).pdf)
+----------------------------------------------------
+
+Official user manual for the Z80 Macro Assembler by SLR Systems
+included in the z80asm disk image.
+
+
+
+
+
+

Doc/ReadMe.txt

@@ -10,6 +10,18 @@ This directory ("Doc") is part of the RomWBW System Software
 distribution archive.  It contains documentation for components of
 the system.
 
+CPM (Directory)
+---------------
+
+Documentation specific to CP/M, including all versions and derivatives.
+
+
+Language (Directory)
+--------------------
+
+Documentation specific to programming languages, provided with the system
+
+
 ChangeLog.txt
 -------------
 
@@ -31,25 +43,6 @@ 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
-completed as part of the RomWBW distribution.
-
-
-CPM3 Command Summary ("CPM3 Command Summary.pdf")
-CPM3 Programmer's Guide ("CPM3 Programmers Guide.pdf")
-CPM3 System Guide ("CPM3 System Guide.pdf")
-CPM3 User's Guide ("CPM3 Users Guide.pdf")
-------------------------------------------------------
-
-The original DRI CP/M 3.0 Operating System Documentation Set.  This
-should be considered the primary reference for CP/M 3 system operation.
-
-
 DDTZ Manual ("DDTZ.doc")
 ------------------------
 
@@ -69,47 +62,6 @@ Hard Disk Anatomy ("Hard Disk Anatomy.pdf")
 Diagram of a CP/M & MS-DOS (FAT) hybrid hard disk layout.
 
 
-NZCOM User's Manual ("NZCOM Users Manual.pdf")
-----------------------------------------------
-
-NZCOM operating system operation manual.
-
-
-ZCPR Manual ("ZCPR 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.
-
-ZCPR D&J Manual ("ZCPR-DJ.doc")
--------------------------------
-
-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)
 ---------------------------------------------------------
 
@@ -132,37 +84,4 @@ UCSD p-System Users Manual ("UCSD p-System Users Manual.pdf")
 Official user manual for p-System operating system included with
 RomWBW.
 
-
-Z80 Assembler User Manual (z80asm (SLR Systems).pdf)
-----------------------------------------------------
-
-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
+--WBW 5:18 PM 6/14/2023

ReadMe.md

@@ -1,9 +1,9 @@
 
 
 **RomWBW ReadMe** \
-Version 3.4 \
+Version 3.5 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-14 Dec 2023
+15 Jul 2024
 
 # Overview
 
@@ -112,22 +112,20 @@ functionality.
 
 Complete instructions for installation and operation of RomWBW are found
 in the [RomWBW User
-Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20User%20Guide.pdf).
+Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20User%20Guide.pdf).
 
 ## Documentation
 
 Documentation for RomWBW includes:
 
 - [RomWBW User
-  Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20User%20Guide.pdf)
+  Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20User%20Guide.pdf)
 - [RomWBW System
-  Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20System%20Guide.pdf)
+  Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20System%20Guide.pdf)
 - [RomWBW
-  Applications](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20Applications.pdf)
-- [RomWBW ROM
-  Applications](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20ROM%20Applications.pdf)
+  Applications](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Applications.pdf)
 - [RomWBW
-  Errata](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20Errata.pdf)
+  Errata](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Errata.pdf)
 
 # Acknowledgments
 
@@ -197,6 +195,40 @@ let me know if I missed you!
   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

ReadMe.txt

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-14 Dec 2023
+15 Jul 2024
 
 
 
@@ -122,7 +122,6 @@ Documentation for RomWBW includes:
 -   RomWBW User Guide
 -   RomWBW System Guide
 -   RomWBW Applications
--   RomWBW ROM Applications
 -   RomWBW Errata
 
 
@@ -197,6 +196,41 @@ let me know if I missed you!
     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.
 
 

Source/Apps/BBCBASIC/Build.cmd

@@ -0,0 +1,23 @@
+@echo off
+setlocal
+
+set TOOLS=..\..\..\Tools
+
+set PATH=%TOOLS%\zxcc;%PATH%
+
+set CPMDIR80=%TOOLS%/cpm/
+
+zxcc z80asm -dist/FM
+zxcc z80asm -main/FM
+zxcc z80asm -exec/FM
+zxcc z80asm -eval/FM
+zxcc z80asm -asmb/FM
+zxcc z80asm -cmos/FM
+zxcc z80asm -math/FM
+zxcc z80asm -hook/FM
+zxcc z80asm -data/FM
+
+zxcc slrnk -/v,/a:0100,dist,main,exec,eval,asmb,math,hook,cmos,/p:4B00,data,bbcbasic/n,/e
+
+copy /Y bbcbasic.com ..\..\..\Binary\Apps\ || exit /b
+copy /Y bbcbasic.txt ..\..\..\Binary\Apps\ || exit /b

Source/Apps/BBCBASIC/Clean.cmd

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

Source/Apps/BBCBASIC/Makefile

@@ -0,0 +1,11 @@
+OBJECTS = bbcbasic.com
+DOCS = bbcbasic.txt
+DEST = ../../../Binary/Apps
+DOCDEST = ../../../Binary/Apps
+TOOLS = ../../../Tools
+OTHERS = *.rel
+
+include $(TOOLS)/Makefile.inc
+
+bbcbasic.com: dist.rel main.rel exec.rel eval.rel asmb.rel cmos.rel math.rel hook.rel data.rel
+	$(ZXCC) SLRNK -/V,/A:0100,DIST,MAIN,EXEC,EVAL,ASMB,MATH,HOOK,CMOS,/P:4B00,DATA,BBCBASIC/N,/E

Source/Apps/BBCBASIC/bbcbasic.txt

@@ -1,3 +1,20 @@
+This is a RomWBW HBIOS adaptation of BBCBASIC v5.00.  The
+cursor and screen management assumes the use of an ANSI/VT-100 terminal
+which is generally correct for RomWBW.  Support for a hardware system
+timer is also implemented.  If your system does not have a hardware
+timer, the TIME function will always return 0 and the timeout
+parameter of the INKEY(n) function will not be observed (will never
+timeout).
+
+What follows is some basic information on BBCBASIC from the
+distribution.  Note that it starts with the v3.00 information and
+later on provides information on the changes in v5.00.
+
+-- WBW 1:15 PM 5/30/2024
+
+
+
+
                               BBC BASIC (Z80)
 
                          Generic CP/M Version 3.00
@@ -366,4 +383,73 @@
      198  Disk full                254  Bad command
      200  Close error              255  CP/M error
      204  Bad name
-
+
+
+New features in BBC BASIC (Z80) version 5.00, May 2024:
+
+1. BASIC V statements
+
+1.1  WHILE...ENDWHILE
+1.2  Multi-line IF...THEN...ELSE...ENDIF
+1.3  CASE...WHEN...OTHERWISE...ENDCASE
+1.4  LOCAL DATA / RESTORE DATA
+1.5  ON ERROR LOCAL / RESTORE ERROR
+1.6  DIM var LOCAL size 
+1.7  ERROR err, message$
+1.8  RESTORE +n
+1.9  SWAP var1,var2
+1.10 BPUT #file,string$[;]
+1.11 QUIT
+
+2. BASIC V functions
+
+2.1  DIM(array()[,sub])
+2.2  END (pointer to free space)
+2.3  REPORT$
+2.4  Binary constants
+2.5  LEFT$ & RIGHT$ with last parameter omitted
+2.6  MOD(array)
+2.7  SUM(array)
+2.8  SUMLEN(array)
+2.9  GET$#file 
+
+3. BASIC V whole array operations
+
+3.1  Pass a whole array to a FN/PROC
+3.2  Pass a whole array to CALL
+3.3  Whole array assignment
+3.4  Whole array arithmetic *
+3.5  Array dot-product operator
+3.6  Array initialisation lists
+3.7  Array compound assignment (+= etc.)
+3.8  Make a whole array LOCAL
+3.9  DIM a LOCAL array (on the stack) + 
+
+* String array expressions A$() = B$() + C$() are not currently supported.
++ LOCAL string arrays should be initialised to their maximum needed length
+  to eliminate the risk of a memory leak each time the PROC/FN is called:
+     LOCAL a$() : DIM a$(size%) : a$() = STRING$(max%, "a") : a$() = ""
+
+4. Miscellaneous BASIC V features
+
+4.1  Bit-shifts <<, >>, >>>
+4.2  Floating-point indirection (|)
+4.3  RETURNed parameters from FN/PROC
+4.4  Compound assignment (+=, -=, *=, /= etc.)
+4.5  Assigning to a sub-string: LEFT$()=, MID$()= , RIGHT$()=
+4.6  Hooks for CIRCLE,ELLIPSE,FILL,LINE,MOUSE,ORIGIN,RECTANGLE,TINT,SYS,WAIT
+4.7  Hooks for WIDTH function, TINT function, MODE function
+
+5. Extensions to Acorn's BASIC V, compatible with BB4W, BBCSDL and BBCTTY
+
+5.1  EXIT REPEAT / WHILE / FOR [var]
+5.2  Address-of operator ^
+5.3  Byte variables and arrays (& suffix)
+5.4  'BY len' and 'TO term' qualifiers to GET$#file
+5.5  ELSE IF <condition> THEN; (trailing semicolon)
+5.6  == synonymous with = in comparisons
+5.7  DIM a global array inside a FN/PROC (use RETURN)
+
+Note: The token for PUT has changed from &CE in version 3 to &0E in version 5.
+If this token is present in existing programs it will list as ENDWHILE rather
+than PUT, and the programs will need to be modified to restore functionality.

Source/Apps/BBCBASIC/data.z80

@@ -0,0 +1,69 @@
+	TITLE	BBC BASIC (C) R.T.RUSSELL 1981-2024
+	NAME	('DATA')
+;
+;RAM MODULE FOR BBC BASIC INTERPRETER
+;FOR USE WITH VERSION 5.0 OF BBC BASIC
+;(C) COPYRIGHT R.T.RUSSELL 1981-2024
+;
+	GLOBAL	ACCS
+	GLOBAL	BUFFER
+	GLOBAL	ONERSP
+	GLOBAL	LIBASE
+	GLOBAL	PAGE
+	GLOBAL	LOMEM
+	GLOBAL	FREE
+	GLOBAL	HIMEM
+	GLOBAL	RANDOM
+	GLOBAL	COUNT
+	GLOBAL	WIDTH
+	GLOBAL	ERL
+	GLOBAL	ERR
+	GLOBAL	ERRTRP
+	GLOBAL	ERRTXT
+	GLOBAL	TRACEN
+	GLOBAL	AUTONO
+	GLOBAL	INCREM
+	GLOBAL	LISTON
+	GLOBAL	DATPTR
+	GLOBAL	FNPTR
+	GLOBAL	PROPTR
+	GLOBAL	STAVAR
+	GLOBAL	OC
+	GLOBAL	PC
+	GLOBAL	DYNVAR
+	GLOBAL	CURLIN
+	GLOBAL	USER
+;
+;n.b. ACCS, BUFFER & STAVAR must be on page boundaries.
+;
+ACCS:	DEFS	256		;STRING ACCUMULATOR
+BUFFER:	DEFS	256		;STRING INPUT BUFFER
+STAVAR:	DEFS	27*4		;STATIC VARIABLES
+OC	EQU	STAVAR+15*4	;CODE ORIGIN (O%)
+PC	EQU	STAVAR+16*4	;PROGRAM COUNTER (P%)
+DYNVAR:	DEFS	54*2		;DYN. VARIABLE POINTERS
+FNPTR:	DEFS	2		;DYN. FUNCTION POINTER
+PROPTR:	DEFS	2		;DYN. PROCEDURE POINTER
+;
+PAGE:	DEFS	2		;START OF USER PROGRAM
+LOMEM:	DEFS	2		;START OF DYN. STORAGE
+FREE:	DEFS	2		;FIRST FREE-SPACE BYTE
+HIMEM:	DEFS	2		;FIRST BYTE ABOVE STACK
+LIBASE:	DEFS	2		;START OF FIRST LIBRARY
+;
+TRACEN:	DEFS	2		;TRACE FLAG AND NUMBER
+AUTONO:	DEFS	2		;AUTO FLAG AND NUMBER
+ERRTRP:	DEFS	2		;ON ERROR STMT POINTER \
+ONERSP:	DEFS	2		;ON ERROR LOCAL STKPTR /
+ERRTXT:	DEFS	2		;ERROR MESSAGE POINTER
+DATPTR:	DEFS	2		;DATA POINTER
+ERL:	DEFS	2		;LINE NO OF LAST ERROR
+CURLIN:	DEFS	2		;POINTER TO CURRENT LINE
+RANDOM:	DEFS	5		;RANDOM NUMBER
+COUNT:	DEFS	1		;PRINT POSITION
+WIDTH:	DEFS	1		;PRINT WIDTH
+ERR:	DEFS	1		;ERROR NUMBER
+LISTON:	DEFS	1		;LISTO & OPT FLAG
+INCREM:	DEFS	1		;AUTO INCREMENT
+;
+USER:	END

Source/Apps/BBCBASIC/dist.z80

@@ -1,7 +1,8 @@
-	TITLE	BBCDIST.Z80 (C) R.T.RUSSELL 1982
+	TITLE	BBCDIST.Z80 (C) R.T.RUSSELL 1982-2024
+	NAME	('DIST3')
 ;
-;BBC BASIC (Z80) - CP/M VERSION 2.30 & 3.00
-;(C) COPYRIGHT R.T.RUSSELL, 1982.
+;BBC BASIC (Z80) - CP/M VERSION 2.20 & 3.00
+;(C) COPYRIGHT R.T.RUSSELL, 1982-2024.
 ;ALL RIGHTS RESERVED.
 ;
 ;THIS PROGRAM ALLOWS THE USER TO ADAPT BBC BASIC TO THE
@@ -13,11 +14,14 @@
 ;PLEASE NOTE THAT A Z80 PROCESSOR AND CP/M VERSION 2.2
 ;OR LATER ARE REQUIRED.
 ;
-;R.T.RUSSELL, 11-03-1984, 03-05-1989
-;ALTERNATE REGISTERS SAVED FOR BDOS CALL, 04-06-2000
+;R.T.RUSSELL, 11-03-1984, 03-05-1989, 12-05-2024
 ;
 CPM	EQU	5
 COLD	EQU	200H
+;
+CR	EQU	0DH
+LF	EQU	0AH
+ESC	EQU	1BH
 ;
 	GLOBAL	CLRSCN
 	GLOBAL	PUTCSR
@@ -26,14 +30,18 @@ COLD	EQU	200H
 	GLOBAL	GETIME
 	GLOBAL	GETKEY
 	GLOBAL	BYE
+	GLOBAL	BEGIN
+;	GLOBAL	BDOS
 ;
-	ASEG
-	ORG	100H
+;	EXTRN	PRTDEC16
+;
+	;ASEG
+	;ORG	100H
 ;
 ;JUMP TABLE - BASIC makes calls to hardware-dependent
 ;features via this table:
 ;
-	JP	INIT
+BEGIN:	JP	INIT
 CLRSCN:	JP	CLS		;CLEAR SCREEN
 PUTCSR:	JP	PCSR		;SET CURSOR POSN.
 GETCSR:	JP	GCSR		;READ CURSOR POSN.
@@ -42,30 +50,33 @@ GETIME:	JP	GTIME		;READ ELAPSED TIME
 GETKEY:	JP	INKEY		;READ KEY (TIME LIMIT)
 BYE:	JP	REBOOT		;RETURN TO CP/M
 ;
-;THE CODE WHICH FOLLOWS IS A SKELETON VERSION SUITABLE
-;FOR ANY CP/M SYSTEM.  IT HAS BEEN CONFIGURED FOR A VT100 TO SOME DEGREE
-;BY PETER SCHORN.
+;BDOS	- Save the IX and IY registers and before performing a
+;	  CP/M function call.
+;
+BDOS:	PUSH	IX
+	PUSH	IY
+	CALL	CPM
+	POP	IY
+	POP	IX
+	RET
 ;
-
-PRSTR	EQU	9
-
 ;INIT	- Perform hardware initialisation (if any).
 ;
-INIT:	LD	A,2
-	INC	A
-	LD	DE,NOTZ80
-	JP	PE,FAIL
-	LD	C,12
-	CALL	BDOS
-	OR	A
-	LD	DE,NOTV2
-	JP	NZ,COLD
-FAIL:	LD	C,PRSTR
+INIT:	LD	HL,40H		;CPM/HBIOS MARKER LOC
+	LD	A,'W'
+	CP	(HL)
+	JR	NZ,FAIL
+	INC	HL
+	LD	A,NOT 'W'
+	CP	(HL)
+	JR	NZ,FAIL
+	JP	COLD
+FAIL:	LD	DE,NOTHB
+	LD	C,9
 	CALL	BDOS
 	RST	0
 ;
-NOTZ80:	DEFB	'Wrong processor$'
-NOTV2:	DEFB	'Wrong CP/M version$'
+NOTHB:	DEFB	'CP/M w/ HBIOS required$'
 ;
 ;REBOOT	- Switch off interrupts and return to CP/M
 ;
@@ -75,31 +86,34 @@ REBOOT:	RST	0
 ;  	  Outputs: DEHL = elapsed time (centiseconds)
 ; 	  Destroys: A,D,E,H,L,F
 ;
-GTIME:	LD	DE,0
-	LD	HL,0
-	RET
+GTIME:	JR	TICKS
 ;
 ;PTIME	- Load elapsed-time clock.
 ;   	  Inputs: DEHL = time to load (centiseconds)
 ; 	  Destroys: A,D,E,H,L,F
 ;
-PTIME:	RET
-;
-;CLS	- Clear screen for VT100.
-; 	  Destroys: A,D,E,H,L,F
-;
-CLS:	PUSH	BC		; save BC
-	LD	C,PRSTR		; command for output string
-	LD	DE,CLSSTR	; start address of string
-	CALL	BDOS		; output to terminal
-	POP	BC		; restore BC
+PTIME:
+	LD	BC,0F9D0H
+	SRL	D
+	RR	E
+	RR	H
+	RR	L
+	RST	08
+	RET
+;
+; Get OS elapsed-time clock
+;  Outputs: DEHL = time (centiseconds)
+; Destroys: A,B,C,D,E,H,L,F
+;
+TICKS:	LD	BC,0F8D0H
+	RST	08
+	SLA	L
+	RL	H
+	RL	E
+	RL	D
 	RET
-CLSSTR:	DEFB	27,'[2J$'	; VT100 string for clear screen
-
 ;
 ;INKEY	- Sample keyboard with specified wait.
-;	  This version uses a simple software timing loop.
-;	  Modify to use hardware/interrupt timer if available.
 ;   	  Inputs: HL = Time to wait (centiseconds)
 ;  	  Outputs: Carry reset indicates time-out.
 ;                  If carry set, A = character typed.
@@ -107,52 +121,64 @@ CLSSTR:	DEFB	27,'[2J$'	; VT100 string for clear screen
 ;
 INKEY:	PUSH	BC
 	PUSH	HL
+	CALL	TICKS
+	POP	DE
+	ADD	HL,DE
+WAIT:	PUSH	HL
 	LD	C,6
 	LD	E,0FFH
-	CALL	BDOS		;CONSOLE INPUT
+	CALL	BDOS
 	POP	HL
-	POP	BC
 	OR	A
 	SCF
-	RET	NZ		;KEY PRESSED
-	OR	H
-	OR	L
-	RET	Z		;TIME-OUT
-	PUSH	BC
-	LD	A,-1
-	LD	BC,1250		;DELAY CONSTANT
-WAIT:	DEC	BC
-	CP	B
-	JP	NZ,WAIT		;WAIT FOR APPROX 10ms
-	POP	BC
-	DEC	HL
-	JR	INKEY
+	JR	NZ,INKEY1
+	PUSH	HL
+	CALL	TICKS
+	POP	DE
+	SBC	HL,DE
+	EX	DE,HL
+	JR	C,WAIT	
+INKEY1:	POP	BC
+	RET
+;
+;CLS	- Clear screen.
+;	  (Customise to suit your VDU)
+; 	  Destroys: A,D,E,H,L,F
+;
+CLS:
+	LD	DE,CLSSTR
+	LD	C,9
+	JP	BDOS
+;
+CLSSTR:	DEFB	ESC,'[H',ESC,'[2J$'
 ;
 ;PCSR	- Move cursor to specified position.
 ;   	  Inputs: DE = horizontal position (LHS=0)
 ;                 HL = vertical position (TOP=0)
-; called by TAB(column, row)
+; 	  Destroys: A,D,E,H,L,F
+;
 PCSR:	LD	B,L		; vertical = line (row)
 	CALL	CONV		; normalized and convert to decimal
 	LD	(LIN),HL	; and store into string
 	LD	B,E		; horizontal = column
 	CALL	CONV		; normalized and convert to decimal
 	LD	(COL),HL	; and store into string
-	LD	C,PRSTR		; output string command
+	LD	C,9		; output string command
 	LD	DE,CURS		; start of string
-	JR	BDOS		; output string to terminal
-
+	JP	BDOS		; output string to terminal
+;
 ; VT100 sequence for cursor positioning
 CURS:	DEFB	27, '['
 LIN:	DEFW	0		; high byte, low byte for decimal line
 	DEFB	';'
 COL:	DEFW	0		; high byte, low byte for decimal column
 	DEFB	'H$'
-
+;
 ; convert binary B (0 <= B < 99, not checked) into B+1 in decimal.
 ; L = upper byte, H = lower byte. ready for LD (...), HL
 ; destroys A, B, L, H
 ; optimized for space over time
+;
 CONV:	INC	B		; normalize, home in VT100 is (1,1)
 	LD	A,'0'		; A is counter for low byte of result
 	LD	L,A		; L is counter for high byte of result
@@ -164,35 +190,7 @@ CONVLP:	INC	A		; now B times increment AL in decimal
 CONT:	DJNZ	CONVLP		; B times
 	LD	H,A		; put low byte into right place
 	RET
-
-
-;BDOS   - Save the IX and IY and alternate registers
-;         before performing a CP/M function call.
 ;
-BDOS:	PUSH	IX
-	PUSH	IY
-        EXX
-        PUSH    BC
-        PUSH    DE
-        PUSH    HL
-        EXX
-        EX      AF,AF'
-        PUSH    AF
-        EX      AF,AF'
-	CALL	CPM
-        EX      AF,AF'
-        POP     AF
-        EX      AF,AF'
-        EXX
-        POP     HL
-        POP     DE
-        POP     BC
-        EXX
-	POP	IY
-	POP	IX
-	RET
-
-
 ;GCSR	- Return cursor coordinates.
 ;   	  Outputs:  DE = X coordinate (POS)
 ;                   HL = Y coordinate (VPOS)
@@ -202,24 +200,42 @@ GCSR:	LD	DE,0
 	LD	HL,0
 	RET
 ;
-	IF	$ GT 1F4H
+;COUT - Output a character to the console
+;   Inputs: A = character
+; Destroys: A,F
+;
+COUT:	PUSH	BC
+	PUSH	DE
+	PUSH	HL
+	LD	E,A
+	LD	C,2
+	CALL	BDOS
+	POP	HL
+	POP	DE
+	POP	BC
+	RET
+;
+	;IF	$ GT 1F0H
+	IF	$-BEGIN GT 0F0H
 	ERROR	'INSUFFICIENT SPACE'
 	ENDIF
 ;
-	ORG	1F4H
+	;ORG	1F0H
+	DEFS	0F0H - ($ - BEGIN)
 ;
+OFFLO:	DEFW	0		;TIME OFFSET LO
+OFFHI:	DEFW	0		;TIME OFFSET HI
 	DEFB	80		;WIDTH
-	DEFB	'E' AND 1FH	;CURSOR UP
-	DEFB	'X' AND 1FH	;CURSOR DOWN
-	DEFB	'A' AND 1FH	;START OF LINE
-	DEFB	'F' AND 1FH	;END OF LINE
-	DEFB	'T' AND 1FH	;DELETE TO END OF LINE
-	DEFB	'H' AND 1FH	;BACKSPACE
-	DEFB	'U' AND 1FH	;CANCEL LINE
-	DEFB	'S' AND 1FH	;CURSOR LEFT
-	DEFB	'D' AND 1FH	;CURSOR RIGHT
-	DEFB	'G' AND 1FH	;DELETE CHARACTER
-	DEFB	'V' AND 1FH	;INSERT CHARACTER
+	DEFB	'G' AND 1FH	;CURSOR UP
+	DEFB	'O' AND 1FH	;CURSOR DOWN
+	DEFB	'F' AND 1FH	;START OF LINE
+	DEFB	'N' AND 1FH	;END OF LINE
+	DEFB	'X' AND 1FH	;DELETE TO END OF LINE
+	DEFB	08H		;BACKSPACE & DELETE
+	DEFB	'U' AND 1FH	;DEL TO START OF LINE
+	DEFB	'J' AND 1FH	;CURSOR LEFT
+	DEFB	'L' AND 1FH	;CURSOR RIGHT
+	DEFB	'R' AND 1FH	;DELETE CHARACTER
+	DEFB	'Q' AND 1FH	;INS/OVR TOGGLE
 ;
 FIN:	END
-

Source/Apps/BBCBASIC/hook.z80

@@ -0,0 +1,64 @@
+	NAME	('HOOK')
+;
+	GLOBAL	CLG
+	GLOBAL	COLOUR
+	GLOBAL	DRAW
+	GLOBAL	ENVEL
+	GLOBAL	GCOL
+	GLOBAL	MODE
+	GLOBAL	MOVE
+	GLOBAL	PLOT
+	GLOBAL	SOUND
+	GLOBAL	PUTIMS
+	GLOBAL	CIRCLE
+	GLOBAL	ELLIPSE
+	GLOBAL	FILL
+	GLOBAL	MOUSE
+	GLOBAL	ORIGIN
+	GLOBAL	RECTAN
+	GLOBAL	LINE
+	GLOBAL	TINT
+	GLOBAL	WAIT
+	GLOBAL	SYS
+;
+	GLOBAL	ADVAL
+	GLOBAL	POINT
+	GLOBAL	GETIMS
+	GLOBAL	TINTFN
+	GLOBAL	MODEFN
+	GLOBAL	WIDFN
+;
+	EXTRN	EXTERR
+;
+CLG:
+COLOUR:
+DRAW:
+ENVEL:
+GCOL:
+MODE:
+MOVE:
+PLOT:
+SOUND:
+ADVAL:
+POINT:
+GETIMS:
+PUTIMS:
+CIRCLE:
+ELLIPSE:
+FILL:
+MOUSE:
+ORIGIN:
+RECTAN:
+LINE:
+TINT:
+TINTFN:
+MODEFN:
+WIDFN:
+WAIT:
+SYS:
+	XOR	A
+	CALL	EXTERR
+	DEFM	'Sorry'
+	DEFB	0
+;
+	END

Source/Apps/Build.cmd

@@ -30,6 +30,7 @@ pushd VGM && call Build || exit /b & popd
 pushd cpuspd && call Build || exit /b & popd
 pushd Survey && call Build || exit /b & popd
 pushd HTalk && call Build || exit /b & popd
+pushd BBCBASIC && call Build || exit /b & popd
 
 copy *.com %APPBIN%\ || exit /b
 

Source/Apps/Clean.cmd

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

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,105 +0,0 @@
-RomWBW HBIOS CP/M FAT Utility ("FAT.COM")
-
-Author: Wayne Warthen
-Updated: 12-Oct-2023
-
-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
-  12-Oct-2023: v0.9.9 (beta) handle updated HBIOS Disk Device call
-		      

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

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/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/inttest/Build.cmd

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

Source/Apps/Test/inttest/Makefile

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

Source/Apps/Test/inttest/inttest.asm

@@ -176,6 +176,8 @@ estidx:
 	jr	z,hkim
 	cp	2
 	jr	z,hkim
+	cp	3
+	jr	z,hkim
 	ret
 ;
 ; Setup interrupt handler
@@ -545,8 +547,8 @@ stack	.equ	$		; stack top
 ;
 ; Messages
 ;
-msgban	.db	"INTTEST v1.2, 15-May-2019",13,10
-	.db	"Copyright (C) 2019, Wayne Warthen, GNU GPL v3",0
+msgban	.db	"INTTEST v1.3, 16-May-2024",13,10
+	.db	"Copyright (C) 2024, Wayne Warthen, GNU GPL v3",0
 msginfo	.db	"Interrupt information request...",0
 msgmode	.db	"  Active interrupt mode: ",0
 msgcnt	.db	"  Vector entries in use: ",0

Source/Apps/Test/inttest/inttest.doc

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

Source/Apps/Test/ps2info/ps2info.asm

@@ -11,6 +11,7 @@
 ; 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
+; WBW 2024-06-10: Add support for RC2014
 ;
 ;=======================================================================
 ;
@@ -25,6 +26,10 @@ 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
+; RC2014 (EP/Sally)
+iocmd_rc	.equ	$64	; PS/2 controller command port address
+iodat_rc	.equ	$60	; PS/2 controller data port address
+
 ;
 cpumhz	.equ	8	; for time delay calculations (not critical)
 ;
@@ -87,6 +92,8 @@ setup1:
 	jr	z,setup_rph
 	cp	'3'			; Duodyne
 	jr	z,setup_duo
+	cp	'4'			; RC2014 EP/Sally
+	jr	z,setup_rc
 	cp	'X'
 	jr	z,exit
 	jr	setup
@@ -115,6 +122,14 @@ setup_duo:
 	ld	de,str_duo
 	jr	setup2
 ;
+setup_rc:
+	ld	a,iocmd_rc
+	ld	(iocmd),a
+	ld	a,iodat_rc
+	ld	(iodat),a
+	ld	de,str_rc
+	jr	setup2
+;
 setup2:
 	call	prtstr
 	call	crlf2
@@ -1437,16 +1452,18 @@ delay1:
 ; Constants
 ;=======================================================================
 ;
-str_banner		.db	"PS/2 Keyboard/Mouse Information v0.8, 6-Nov-2023",0
+str_banner		.db	"PS/2 Keyboard/Mouse Information v0.9, 10-Jun-2024",0
 str_hwmenu		.db	"PS/2 Controller Port Options:\r\n\r\n"
 			.db	"  1 - Nhyodyne\r\n"
 			.db	"  2 - Rhyophyre\r\n"
 			.db	"  3 - Duodyne\r\n"
+			.db	"  4 - RC2014\r\n"
 			.db	"  X - Exit Application\r\n"
 			.db	"\r\nSelection? ",0
 str_mbc			.db	"Nhyodyne",0
 str_rph			.db	"Rhyophyre",0
 str_duo			.db	"Duodyne",0
+str_rc			.db	"RC2014 (Saly)",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"

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/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/sound/ay-test.asm

@@ -13,9 +13,9 @@
 ;
 ; Hardware port addresses
 ;
-rsel	.equ	$9A		; Register seelection port address
-rdat	.equ	$9B		; Register data port address
-acr	.equ	$9C		; Aux control register port address
+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
 ;

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/tune.asm

@@ -46,6 +46,11 @@
 ;   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!
+;   2024-07-08 [WBW] Add support for Les Bird's Graphics, Sound, Joystick
+;   2024-07-11 [WBW] Updated, Les Bird's module now uses same settings as EB6
 ;_______________________________________________________________________________
 ;
 ; ToDo:
@@ -138,11 +143,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:
@@ -554,84 +558,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)
-	.DW	HWSTR_RCEB6
+	.DB	$07,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ80 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
-	.DB	$07,	$D1,	$D0,	$D0,	$FF,	$FF	; 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)
-	.DW	HWSTR_RCEB6
+	.DB	$08,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; RCZ180 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
-	.DB	$08,	$61,	$60,	$60,	$C0,	$FF	; 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)
-	.DW	HWSTR_RCEB6
+	.DB	$09,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; EZZ80 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
-	.DB	$09,	$D1,	$D0,	$D0,	$FF,	$FF	; 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)
-	.DW	HWSTR_RCEB6
+	.DB	$0A,	$A0,	$A1,	$A2,	$C0,	$FF,	$FF	; SCZ180 W/ RC SOUND MODULE (MS6)
+	.DW	HWSTR_RCMSX
 ;
-	.DB	$0A,	$61,	$60,	$60,	$C0,	$FF	; 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)
-	.DW	HWSTR_RCEB6
+	.DB	$0B,	$A0,	$A1,	$A2,	$FF,	$FF,	$FF	; RCZ280 W/ RC SOUND MODULE (MSX)
+	.DW	HWSTR_RCMSX
 ;
-	.DB	$0B,	$D1,	$D0,	$D0,	$FF,	$FF	; 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,	$A0,	$A1,	$A0,	$FF,	$A2	; DUODYNE
+	.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
 ;
@@ -642,7 +649,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
@@ -660,8 +668,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.5a, 30-Mar-2023",0
-MSGUSE		.DB	"Copyright (C) 2023, Wayne Warthen, GNU GPL v3",13,10
+MSGBAN		.DB	"Tune Player for RomWBW v3.10, 11-Jul-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
@@ -681,11 +689,12 @@ MSGERR		.DB	"App Error", 0
 HWSTR_SCG	.DB	"SCG ECB Board",0
 HWSTR_N8	.DB	"N8 Onboard Sound",0
 HWSTR_RCEB	.DB	"RCBus Sound Module (EB)",0
-HWSTR_RCEB6	.DB	"RCBus Sound Module (EBv6)",0
+HWSTR_RCMSX	.DB	"RCBus Sound Module (MSX)",0
 HWSTR_RCMF	.DB	"RCBus Sound Module (MF)",0
 HWSTR_LINC	.DB	"Z50 LiNC Sound Module",0
 HWSTR_MBC	.DB	"NHYODYNE Sound Module",0
 HWSTR_DUO	.DB	"DUODYNE Sound Module",0
+HWSTR_NABU	.DB	"NABU Onboard Sound",0
 
 MSGUNSUP	.db	"MYM files not supported with HBIOS yet!\r\n", 0
 
@@ -2079,8 +2088,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
@@ -2090,6 +2114,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
@@ -2536,8 +2561,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

@@ -48,7 +48,7 @@ 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

Source/Apps/cpuspd/cpuspd.asm

@@ -189,9 +189,9 @@ show_spd:
 	ld	b,BF_SYSGET
 	ld	c,BF_SYSGET_CPUINFO
 	rst	08
-	jp	nz,err_not_sup
+	jp	nz,err_api
 	call	crlf2
-	ld	(cpu_spd),de		; save CPU speed for now
+	push	de			; save CPU speed for now
 	push	bc			; Oscillator speed to HL
 	pop	hl
 	ld	de,str_spacer
@@ -199,10 +199,18 @@ 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
+	ret	nz			; no CPU speed info, done
 	push	de			; save wait states for now
 	ld	a,l
 	ld	de,str_slow
@@ -216,11 +224,6 @@ show_spd:
 	jr	z,show_spd1
 	jp	err_invalid
 show_spd1:
-	call	crlf
-	call	prtstr
-	ld	hl,(cpu_spd)		; recover CPU speed
-	call	prtd3m
-	ld	de,str_cpuspd
 	call	prtstr
 	pop	hl
 	ld	a,h			; memory wait states
@@ -284,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
@@ -659,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"
@@ -693,7 +702,6 @@ stack		.equ	$		; stack top
 ;
 ;
 tmpstr		.fill	9,0		; temp string (8 chars, 0 term)
-cpu_spd		.dw	0		; current cpu speed
 new_cpu_spd	.db	$FF		; new CPU speed
 new_ws_mem	.db	$FF		; new memory wait states
 new_ws_io	.db	$FF		; new I/O wait states

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/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/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/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

@@ -120,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/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 ---
 

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 ---
 

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 ---
 

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 ---
 

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 ---
 

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,35 +284,9 @@ diskdef wbw_rom256
   os 2.2
 end
 
-# RomWBW 512KB ROM (128KB reserved, 384KB ROM Disk)
+# RomWBW 256KB ROM Disk
 
-diskdef wbw_rom512
-  seclen 512
-  tracks 12
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 1024KB ROM (128KB reserved, 896KB ROM Disk)
-
-diskdef wbw_rom1024
-  seclen 512
-  tracks 28
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 512KB RAM (256KB reserved, 256KB RAM Disk)
-
-diskdef wbw_ram512
+diskdef wbw_rom256
   seclen 512
   tracks 8
   sectrk 64
@@ -323,11 +297,24 @@ diskdef wbw_ram512
   os 2.2
 end
 
-# RomWBW 1024KB RAM (256KB reserved, 768KB RAM Disk)
+# RomWBW 384KB ROM Disk
 
-diskdef wbw_ram1024
+diskdef wbw_rom384
   seclen 512
-  tracks 24
+  tracks 12
+  sectrk 64
+  blocksize 2048
+  maxdir 256
+  skew 0
+  boottrk 0
+  os 2.2
+end
+
+# RomWBW 896KB ROM Disk
+
+diskdef wbw_rom896
+  seclen 512
+  tracks 28
   sectrk 64
   blocksize 2048
   maxdir 256