diff --git a/Source/Images/d_bp/u0/LDDS.COM b/Source/Images/d_bp/u0/LDDS.COM index f4b235fc..357f1360 100644 Binary files a/Source/Images/d_bp/u0/LDDS.COM and b/Source/Images/d_bp/u0/LDDS.COM differ diff --git a/Source/Images/d_bp/u0/LDNZT.COM b/Source/Images/d_bp/u0/LDNZT.COM index 521fc3aa..87cf0b47 100644 Binary files a/Source/Images/d_bp/u0/LDNZT.COM and b/Source/Images/d_bp/u0/LDNZT.COM differ diff --git a/Source/Images/d_bp/u0/LDP2D.COM b/Source/Images/d_bp/u0/LDP2D.COM index 502032c2..a89e03d8 100644 Binary files a/Source/Images/d_bp/u0/LDP2D.COM and b/Source/Images/d_bp/u0/LDP2D.COM differ diff --git a/Source/Images/d_bp/u0/SUBMIT.COM b/Source/Images/d_bp/u0/SUBMIT.COM index 2e788827..f651bfee 100644 Binary files a/Source/Images/d_bp/u0/SUBMIT.COM and b/Source/Images/d_bp/u0/SUBMIT.COM differ diff --git a/Source/Images/d_zsdos/u0/CLOCKS.DAT b/Source/Images/d_zsdos/u0/CLOCKS.DAT index a78c2d6c..e64c7e05 100644 Binary files a/Source/Images/d_zsdos/u0/CLOCKS.DAT and b/Source/Images/d_zsdos/u0/CLOCKS.DAT differ diff --git a/Source/Images/d_zsdos/u0/LDDS.COM b/Source/Images/d_zsdos/u0/LDDS.COM index 9be1d4a4..357f1360 100644 Binary files a/Source/Images/d_zsdos/u0/LDDS.COM and b/Source/Images/d_zsdos/u0/LDDS.COM differ diff --git a/Source/Images/d_zsdos/u0/LDNZT.COM b/Source/Images/d_zsdos/u0/LDNZT.COM index 535d8418..87cf0b47 100644 Binary files a/Source/Images/d_zsdos/u0/LDNZT.COM and b/Source/Images/d_zsdos/u0/LDNZT.COM differ diff --git a/Source/Images/d_zsdos/u0/LDP2D.COM b/Source/Images/d_zsdos/u0/LDP2D.COM index 40220f17..a89e03d8 100644 Binary files a/Source/Images/d_zsdos/u0/LDP2D.COM and b/Source/Images/d_zsdos/u0/LDP2D.COM differ diff --git a/Source/RomDsk/ROM_1024KB/CLOCKS.DAT b/Source/RomDsk/ROM_1024KB/CLOCKS.DAT index a78c2d6c..e64c7e05 100644 Binary files a/Source/RomDsk/ROM_1024KB/CLOCKS.DAT and b/Source/RomDsk/ROM_1024KB/CLOCKS.DAT differ diff --git a/Source/RomDsk/ROM_1024KB/LDDS.COM b/Source/RomDsk/ROM_1024KB/LDDS.COM index 9be1d4a4..357f1360 100644 Binary files a/Source/RomDsk/ROM_1024KB/LDDS.COM and b/Source/RomDsk/ROM_1024KB/LDDS.COM differ diff --git a/Source/RomDsk/ROM_1024KB/LDNZT.COM b/Source/RomDsk/ROM_1024KB/LDNZT.COM index 535d8418..87cf0b47 100644 Binary files a/Source/RomDsk/ROM_1024KB/LDNZT.COM and b/Source/RomDsk/ROM_1024KB/LDNZT.COM differ diff --git a/Source/RomDsk/ROM_1024KB/LDP2D.COM b/Source/RomDsk/ROM_1024KB/LDP2D.COM index 40220f17..a89e03d8 100644 Binary files a/Source/RomDsk/ROM_1024KB/LDP2D.COM and b/Source/RomDsk/ROM_1024KB/LDP2D.COM differ diff --git a/Source/RomDsk/ROM_512KB/LDDS.COM b/Source/RomDsk/ROM_512KB/LDDS.COM index 9be1d4a4..357f1360 100644 Binary files a/Source/RomDsk/ROM_512KB/LDDS.COM and b/Source/RomDsk/ROM_512KB/LDDS.COM differ diff --git a/Source/RomDsk/ROM_512KB/LDP2D.COM b/Source/RomDsk/ROM_512KB/LDP2D.COM index 40220f17..a89e03d8 100644 Binary files a/Source/RomDsk/ROM_512KB/LDP2D.COM and b/Source/RomDsk/ROM_512KB/LDP2D.COM differ diff --git a/Source/ZSDOS/Clock/Build.cmd b/Source/ZSDOS/Clock/Build.cmd index 55bcd8db..8b14f5c5 100644 --- a/Source/ZSDOS/Clock/Build.cmd +++ b/Source/ZSDOS/Clock/Build.cmd @@ -11,4 +11,4 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx ZMAC -HBCLK -/P +zx ZMAC -WBWCLK -/P diff --git a/Source/ZSDOS/Clock/CLOCKS.DAT b/Source/ZSDOS/Clock/CLOCKS.DAT index a78c2d6c..e64c7e05 100644 Binary files a/Source/ZSDOS/Clock/CLOCKS.DAT and b/Source/ZSDOS/Clock/CLOCKS.DAT differ diff --git a/Source/ZSDOS/Clock/LDDS.COM b/Source/ZSDOS/Clock/LDDS.COM index 9be1d4a4..357f1360 100644 Binary files a/Source/ZSDOS/Clock/LDDS.COM and b/Source/ZSDOS/Clock/LDDS.COM differ diff --git a/Source/ZSDOS/Clock/LDNZT.COM b/Source/ZSDOS/Clock/LDNZT.COM index 535d8418..87cf0b47 100644 Binary files a/Source/ZSDOS/Clock/LDNZT.COM and b/Source/ZSDOS/Clock/LDNZT.COM differ diff --git a/Source/ZSDOS/Clock/LDP2D.COM b/Source/ZSDOS/Clock/LDP2D.COM index 40220f17..a89e03d8 100644 Binary files a/Source/ZSDOS/Clock/LDP2D.COM and b/Source/ZSDOS/Clock/LDP2D.COM differ diff --git a/Source/ZSDOS/Clock/ReadMe.txt b/Source/ZSDOS/Clock/ReadMe.txt index 05aaa67a..0fc634f7 100644 --- a/Source/ZSDOS/Clock/ReadMe.txt +++ b/Source/ZSDOS/Clock/ReadMe.txt @@ -1,9 +1,23 @@ -This directory contains the source and assembled versions of the ZSystem Clock Drivers for N8VEM HBIOS. +This directory contains the source and assembled versions of the +ZSystem Clock Drivers for RomWBW HBIOS. -The hbclk.z80 source file can be compiled using Build.cmd which will produce a relocatable binary (hbclk.rel). +The wbwclk.z80 source file can be compiled using Build.cmd which will +produce a relocatable binary (hbclk.rel). -The relocatable binary should be added/updated in the stamps.dat libary. The stamps.dat file is just a standard LU type library and is easily updated using NULU. The members are the relocatable binaries, but with the .REL extension removed. +The relocatable binary should be added/updated in the STAMPS.DAT +library. The STAMPS.DAT file is just a standard LU type library and +is easily updated using NULU. The members are the relocatable +binaries, but with the .REL extension removed. -SETUPZST is used to create runnable executable (.COM) files. An executable has been created for DateStamper (LDDS.COM) and P2DOS (LDP2D.COM). The executables are all configured for operation as an RSX (resident system extension). +SETUPZST is used to create runnable executable (.COM) files. An +executable has been created for DateStamper (LDDS.COM), P2DOS +(LDP2D.COM), and NZTime (LDNZT.COM) . The executables are all +configured for operation as an RSX (resident system extension). -The STAMPS.DAT file here is a version that I cobbled together. Using the STAMPS.DAT file included in the ZSDOS distribution results in a load file that does not work. It claims to load, but is not present. I found a "fixed" version of STAMPS.DAT on the Walnut Creek CD-ROM which works, but was missing the NZ and NZP2 stamp variants. So, I added those variants to the working version of STAMPS.DAT which is included here. +The STAMPS.DAT file here is a version that I cobbled together. Using +the STAMPS.DAT file included in the ZSDOS distribution results in a +load file that does not work. It claims to load, but is not +present. I found a "fixed" version of STAMPS.DAT on the Walnut Creek +CD-ROM which works, but was missing the NZ and NZP2 stamp variants. +So, I added those variants to the working version of STAMPS.DAT which +is included here. diff --git a/Source/ZSDOS/Clock/preclock.lib b/Source/ZSDOS/Clock/preclock.lib index fd7d711e..8c539963 100644 --- a/Source/ZSDOS/Clock/preclock.lib +++ b/Source/ZSDOS/Clock/preclock.lib @@ -10,6 +10,8 @@ TSTRD: JR TSTRD0 ; Jump around address store TSTRD0: LD (CKCLK+1),DE ; Patch GETTIM address in CALL CKCLK ; Get time to start with + DEC A ; WBW: 1 -> 0 + JR NZ,BAD ; WBW: NO GOOD LD A,(HL) ; Get seconds CP 60H ; Check for valid digit JR NC,BAD ; >= 60h diff --git a/Source/ZSDOS/Clock/hbclk.z80 b/Source/ZSDOS/Clock/wbwclk.z80 similarity index 88% rename from Source/ZSDOS/Clock/hbclk.z80 rename to Source/ZSDOS/Clock/wbwclk.z80 index f28c6af1..05c43b9c 100644 --- a/Source/ZSDOS/Clock/hbclk.z80 +++ b/Source/ZSDOS/Clock/wbwclk.z80 @@ -1,15 +1,15 @@ - TITLE "N8VEM HBIOS Clock Interface" + TITLE "ROMWBW HBIOS Clock Interface" SUBTTL "Description of Clock Module" ;=================================================================== -; HBCLK.Z80 -; HBIOS Clock driver for N8VEM Z80 Series Computer +; WBWCLK.Z80 +; HBIOS Clock driver for RomWBW System Software ; Wayne Warthen -; Version: 18 Apr 2014 +; Version: 31 Mar 2020 ;=================================================================== -VERS EQU 10 +VERS EQU 11 .Z80 - NAME HBIOS + NAME WBWCLK MACLIB CLOCK.LIB @@ -17,10 +17,10 @@ VERS EQU 10 DESCST: DEFW 0 ; Pointer to static year value if required -CLKNAM: DEFB 'N8VEM HBIOS Clock ' ; Exactly 24 chars in name +CLKNAM: DEFB 'RomWBW HBIOS Clock ' ; Exactly 24 chars in name DEFB VERS/10+'0','.',VERS MOD 10 +'0',0 -DESCR: DEFB 'N8VEM Z80 Series HBIOS Clock',0 +DESCR: DEFB 'RomWBW Series HBIOS Clock',0 IF [$-DESCST] > 256 OVER2 @@ -55,9 +55,9 @@ GETTIM: PUSH HL ; Save final buffer pointer LD HL,TIMBUF ; Point to temp buf for HBIOS read LD B,20H ; HBIOS Read Clock function = $20 RST 08 ; Call HBIOS to get time - JR NZ,ERRRET ; Error return LD HL,TIMBUF ; Source is start of temp buf POP DE ; Destination is buffer provided originally + JR NZ,ERRRET ; Error return LD BC,5 ; Copy just the first 5 bytes LDIR ; Do it LD A,(DE) ; Save the original seconds value @@ -80,7 +80,7 @@ WRCLK: LD DE,TIMBUF ; Copy to temp buf LD A,1 ; Signal success RET ; Done ; -ERRRET: XOR A ; Error +ERRRET: OR 0FFH ; Error RET ; Done ; TIMBUF DEFS 6 ; Temp date/time buffer