More Build Tweaks

Add support for Duodyne media board

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

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
 

Doc/ChangeLog.txt

@@ -2,6 +2,16 @@ 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
 
 Version 3.4
 -----------

ReadMe.md

@@ -3,7 +3,7 @@
 **RomWBW ReadMe** \
 Version 3.5 \
 Wayne Warthen  ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \
-12 Jan 2024
+12 Feb 2024
 
 # Overview
 
@@ -223,6 +223,12 @@ let me know if I missed you!
 
 - 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.
+
 Contributions of all kinds to RomWBW are very welcome.
 
 # Licensing

ReadMe.txt

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen (wwarthen@gmail.com)
-12 Jan 2024
+12 Feb 2024
 
 
 
@@ -224,6 +224,12 @@ let me know if I missed you!
 
 -   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.
+
 Contributions of all kinds to RomWBW are very welcome.
 
 

Source/Apps/Test/Makefile

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

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

@@ -630,7 +630,7 @@ CFGTBL:	;	PLT	RSEL	RDAT	RIN	Z180	ACR
 	.DB	13,	$A0,	$A1,	$A0,	$FF,	$A2	; MBC
 	.DW	HWSTR_MBC
 ;
-	.DB	17,	$A0,	$A1,	$A0,	$FF,	$A2	; DUODYNE
+	.DB	17,	$A4,	$A5,	$A4,	$FF,	$FF	; DUODYNE
 	.DW	HWSTR_DUO
 ;
 	.DB	$FF					; END OF TABLE MARKER

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

Source/BuildShared.cmd

@@ -10,6 +10,7 @@ pushd ZCPR-DJ && call Build || exit /b & popd
 pushd ZSDOS && call Build || exit /b & popd
 pushd CPM3 && call Build || exit /b & popd
 pushd ZPM3 && call Build || exit /b & popd
+pushd CPNET && call Build || exit /b & popd
 pushd pSys && call Build || exit /b & popd
 pushd Apps && call Build || exit /b & popd
 pushd Forth && call Build || exit /b & popd

Source/CPNET/Build.cmd

@@ -0,0 +1,14 @@
+@echo off
+setlocal
+
+set TOOLS=%~dp0..\..\Tools
+
+set PATH=%TOOLS%\zxcc;%PATH%
+set CPMDIR80=%TOOLS%\cpm\
+
+zxcc nulu --O -cpn12mt "-<30" --A mt011/cpnet12/*.* --L --X || exit /b
+zxcc nulu --O -cpn3mt "-<30" --A mt011/cpnet3/*.* --L --X || exit /b
+zxcc nulu --O -cpn12duo "-<30" --A duo/cpnet12/*.* --L --X || exit /b
+zxcc nulu --O -cpn3duo "-<30" --A duo/cpnet3/*.* --L --X || exit /b
+
+copy *.lbr ..\..\Binary\CPNET

Source/CPNET/Clean.cmd

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

Source/CPNET/Makefile

@@ -0,0 +1,18 @@
+OBJECTS = cpn12mt.lbr cpn3mt.lbr cpn12duo.lbr cpn3duo.lbr
+DEST = ../../Binary/CPNET/
+TOOLS = ../../Tools
+
+include $(TOOLS)/Makefile.inc
+
+cpn12%.lbr: CPNETVER=cpnet12
+cpn3%.lbr: CPNETVER=cpnet3
+%mt.lbr: HWVER=mt011
+%duo.lbr: HWVER=duo
+
+%.lbr:
+	rm -f $@
+	$(ZXCC) NULU --O -$(*F) -\<30 --X
+	for f in `ls $(HWVER)/$(CPNETVER) | sort` ; \
+	do \
+	  $(ZXCC) NULU --O -$(*F) --A $(HWVER)/$(CPNETVER)/$$f --X ; \
+	done

Source/CPNET/ReadMe.txt

@@ -6,12 +6,15 @@
 ***                                                                 ***
 ***********************************************************************
 
-This directory contains the CP/M 3 client tools for CP/NET.  These
-tools work only with the MT011 RCBus module.
+This directory contains the CP/M client components for CP/NET.  These
+components require either the MT011 RCBus module or the Duodyne
+Disk I/O board.
 
 All of these files come from Douglas Miller.  Please refer to
 https://github.com/durgadas311/cpnet-z80 for more information and
 the latest source code.
 
-In general, to use CP/NET on RomWBW, it is intended that you will
-copy all of these files into your user 0 directory.
+The build process packages the client files into .lbr packages
+appropriate for the hardware variations and CP/NET versions.
+
+-- WBW 7:15 AM 2/11/2024