diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf index 7e733d99..360c12ee 100644 Binary files a/Doc/RomWBW Applications.pdf and b/Doc/RomWBW Applications.pdf differ diff --git a/Doc/RomWBW Architecture.pdf b/Doc/RomWBW Architecture.pdf index d6f85e18..72aa85c9 100644 Binary files a/Doc/RomWBW Architecture.pdf and b/Doc/RomWBW Architecture.pdf differ diff --git a/Doc/RomWBW Getting Started.pdf b/Doc/RomWBW Getting Started.pdf index a0b4a83e..2dfdd62e 100644 Binary files a/Doc/RomWBW Getting Started.pdf and b/Doc/RomWBW Getting Started.pdf differ diff --git a/ReadMe.md b/ReadMe.md index c2e5de94..aab68ae0 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -3,7 +3,7 @@ ## Z80/Z180 System Software Version 2.9.2 Prerelease -Tuesday 24 March 2020 +Wednesday 25 March 2020 Wayne Warthen @@ -754,7 +754,6 @@ RomWBW Doc directory. ### Errata - - SuperZap (`ZAP.COM`) is not working under NZCOM. - There is no `DIR` command, you must use `SDZ` instead. ## Digital Research CP/M 3 @@ -792,7 +791,6 @@ tracks of the disk. - The ZPM operatins system is contained in the file called CPM3.SYS which is confusing, but it is the author’s intended way of using ZPM3. - - SuperZap (`ZAP.COM`) is not working under ZPM3. ## FreeRTOS diff --git a/ReadMe.txt b/ReadMe.txt index 63c35051..121121bc 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -3,7 +3,7 @@ RomWBW Z80/Z180 System Software Version 2.9.2 Prerelease -Tuesday 24 March 2020 +Wednesday 25 March 2020 Wayne Warthen wwarthen@gmail.com @@ -783,7 +783,6 @@ RomWBW Doc directory. Errata -- SuperZap (ZAP.COM) is not working under NZCOM. - There is no DIR command, you must use SDZ instead. Digital Research CP/M 3 @@ -821,7 +820,6 @@ Errata - The ZPM operatins system is contained in the file called CPM3.SYS which is confusing, but it is the author’s intended way of using ZPM3. -- SuperZap (ZAP.COM) is not working under ZPM3. FreeRTOS diff --git a/Source/Doc/GettingStarted.md b/Source/Doc/GettingStarted.md index 896b5f46..7f087dcd 100644 --- a/Source/Doc/GettingStarted.md +++ b/Source/Doc/GettingStarted.md @@ -802,7 +802,6 @@ Manual.pdf" file in the RomWBW Doc directory. ### Errata -- SuperZap (`ZAP.COM`) is not working under NZCOM. - There is no `DIR` command, you must use `SDZ` instead. ## Digital Research CP/M 3 @@ -840,7 +839,6 @@ has not been evaluated, but it is not a RomWBW issue. - ZPMLDR is included with ZPM3, but it is not working correctly. - The ZPM operatins system is contained in the file called CPM3.SYS which is confusing, but it is the author's intended way of using ZPM3. -- SuperZap (`ZAP.COM`) is not working under ZPM3. ## FreeRTOS diff --git a/Source/HBIOS/Config/RCZ180_ext.asm b/Source/HBIOS/Config/RCZ180_ext.asm index 7c9cca5b..a1dbad03 100644 --- a/Source/HBIOS/Config/RCZ180_ext.asm +++ b/Source/HBIOS/Config/RCZ180_ext.asm @@ -42,4 +42,4 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] ; IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) diff --git a/Source/HBIOS/Config/RCZ180_nat.asm b/Source/HBIOS/Config/RCZ180_nat.asm index 5c83fe9a..46f9c43f 100644 --- a/Source/HBIOS/Config/RCZ180_nat.asm +++ b/Source/HBIOS/Config/RCZ180_nat.asm @@ -42,4 +42,4 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] ; IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) diff --git a/Source/HBIOS/Config/RCZ80_kio.asm b/Source/HBIOS/Config/RCZ80_kio.asm index 8526fa8e..e88df73d 100644 --- a/Source/HBIOS/Config/RCZ80_kio.asm +++ b/Source/HBIOS/Config/RCZ80_kio.asm @@ -22,9 +22,10 @@ ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO ; DIRECTORIES ABOVE THIS ONE). ; -#include "cfg_rcz80.asm" +#DEFINE PLATFORM_NAME "RC2014 (KIO)" +; +#include "Config/RCZ80_std.asm" ; -CPUOSC .SET 7372800 ; CPU OSC FREQ IN MHZ INTMODE .SET 2 ; INTERRUPTS: 0=NONE, 1=MODE 1, 2=MODE 2 ; KIOENABLE .SET TRUE ; ENABLE ZILOG KIO SUPPORT @@ -41,10 +42,3 @@ SIO0BASE .SET KIOBASE+$08 ; SIO 0: REGISTERS BASE ADR SIO0CTCC .SET 0 ; SIO 0: CTC CHANNEL CLOCK SCALER, (0-3), -1 FOR NONE SIO0ACLK .SET 1843200 ; SIO 0A: OSC FREQ IN HZ, ZP=2457600/4915200, RC/SMB=7372800 SIO0BCLK .SET 1843200 ; SIO 0B: OSC FREQ IN HZ, ZP=2457600/4915200, RC/SMB=7372800 -; -FDENABLE .SET FALSE ; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM) -FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] -; -IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) -; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) diff --git a/Source/HBIOS/Config/RCZ80_mt.asm b/Source/HBIOS/Config/RCZ80_mt.asm index bdd72e8d..8806bedd 100644 --- a/Source/HBIOS/Config/RCZ80_mt.asm +++ b/Source/HBIOS/Config/RCZ80_mt.asm @@ -22,7 +22,7 @@ ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO ; DIRECTORIES ABOVE THIS ONE). ; -#DEFINE PLATFORM_NAME "RC2014 (mt)" +#DEFINE PLATFORM_NAME "RC2014 (MT)" ; #include "Config/RCZ80_std.asm" ; diff --git a/Source/HBIOS/Config/RCZ80_std.asm b/Source/HBIOS/Config/RCZ80_std.asm index d266d9f2..f9e0f1fa 100644 --- a/Source/HBIOS/Config/RCZ80_std.asm +++ b/Source/HBIOS/Config/RCZ80_std.asm @@ -35,4 +35,4 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] ; IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) diff --git a/Source/HBIOS/Config/SCZ180_126.asm b/Source/HBIOS/Config/SCZ180_126.asm index 851f3476..d1f1cd1d 100644 --- a/Source/HBIOS/Config/SCZ180_126.asm +++ b/Source/HBIOS/Config/SCZ180_126.asm @@ -45,7 +45,7 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] ; IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) ; SDENABLE .SET TRUE ; SD: ENABLE SD CARD DISK DRIVER (SD.ASM) SDCNT .SET 1 ; SD: NUMBER OF SD CARD DEVICES (1-2), FOR DSD & SC ONLY diff --git a/Source/HBIOS/Config/SCZ180_130.asm b/Source/HBIOS/Config/SCZ180_130.asm index b3f22265..9b838598 100644 --- a/Source/HBIOS/Config/SCZ180_130.asm +++ b/Source/HBIOS/Config/SCZ180_130.asm @@ -51,6 +51,6 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] ; IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) ; SDENABLE .SET TRUE ; SD: ENABLE SD CARD DISK DRIVER (SD.ASM) diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm index 6ce3ce6c..22294698 100644 --- a/Source/HBIOS/romldr.asm +++ b/Source/HBIOS/romldr.asm @@ -447,18 +447,32 @@ MENU_N .EQU ((MENU_E - MENU_S) / MENU_V) ; NUMBER OF MENU ITEMS ; REBOOT: ; -#IF (BIOS == BIOS_WBW) LD DE,STR_REBOOT ; POINT TO MESSAGE CALL WRITESTR ; PRINT IT +; + ; WAIT FOR MESSAGE TO BE DISPLAYED + LD HL,10000 +REBOOT1: ; LOOP IS 26TS + DEC HL ; 6TS + LD A,H ; 4TS + OR L ; 4TS + JR NZ,REBOOT1 ; 12TS +; +#IF (BIOS == BIOS_WBW) +; #IF (DSKYENABLE) LD HL,MSG_BOOT ; POINT TO BOOT MESSAGE CALL DSKY_SHOWSEG ; DISPLAY MESSAGE #ENDIF +; + ; SWITCH TO ROM BANK 0 AND JUMP TO ADDRESS 0 LD A,BID_BOOT ; BOOT BANK LD HL,0 ; ADDRESS ZERO CALL HB_BNKCALL ; DOES NOT RETURN #ENDIF +; #IF (BIOS == BIOS_UNA) + ; SWITCH TO ROM BANK 0 AND JUMP TO ADDRESS 0 LD BC,$01FB ; UNA FUNC = SET BANK LD DE,0 ; ROM BANK 0 RST 08 ; DO IT diff --git a/Source/Images/Common/ZAP.COM b/Source/Images/Common/ZAP.COM index 47ffcbb8..60dddd4f 100644 Binary files a/Source/Images/Common/ZAP.COM and b/Source/Images/Common/ZAP.COM differ diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt index b075ca86..fa445326 100644 --- a/Source/Images/d_bp.txt +++ b/Source/Images/d_bp.txt @@ -17,3 +17,7 @@ ../BPBIOS/myterm.z3t 0: ../BPBIOS/Z34RCP11/z34rcp11.rel 0:rcp.zrl ../BPBIOS/NZFCP13/nzfcp13.rel 0:fcp.zrl +# +# Add Common Applications +# +Common/*.* 0: diff --git a/Source/Images/d_bp/u0/COMPARE.COM b/Source/Images/d_bp/u0/COMPARE.COM deleted file mode 100644 index 29fa41e6..00000000 Binary files a/Source/Images/d_bp/u0/COMPARE.COM and /dev/null differ diff --git a/Source/Images/d_bp/u0/DDTZ.COM b/Source/Images/d_bp/u0/DDTZ.COM deleted file mode 100644 index 4f6eca6b..00000000 Binary files a/Source/Images/d_bp/u0/DDTZ.COM and /dev/null differ diff --git a/Source/Images/d_bp/u0/NULU.COM b/Source/Images/d_bp/u0/NULU.COM deleted file mode 100644 index fc5594b1..00000000 Binary files a/Source/Images/d_bp/u0/NULU.COM and /dev/null differ diff --git a/Source/Images/d_bp/u0/UNARC.COM b/Source/Images/d_bp/u0/UNARC.COM deleted file mode 100644 index 8cc90746..00000000 Binary files a/Source/Images/d_bp/u0/UNARC.COM and /dev/null differ diff --git a/Source/Images/d_bp/u0/ZAP.COM b/Source/Images/d_bp/u0/ZAP.COM deleted file mode 100644 index 47ffcbb8..00000000 Binary files a/Source/Images/d_bp/u0/ZAP.COM and /dev/null differ diff --git a/Source/Images/d_bp/u0/ZDE.COM b/Source/Images/d_bp/u0/ZDE.COM deleted file mode 100644 index 9bc493c3..00000000 Binary files a/Source/Images/d_bp/u0/ZDE.COM and /dev/null differ diff --git a/Source/RomDsk/ROM_1024KB/ZAP.COM b/Source/RomDsk/ROM_1024KB/ZAP.COM index 47ffcbb8..60dddd4f 100644 Binary files a/Source/RomDsk/ROM_1024KB/ZAP.COM and b/Source/RomDsk/ROM_1024KB/ZAP.COM differ diff --git a/Source/RomDsk/ROM_512KB/ZAP.COM b/Source/RomDsk/ROM_512KB/ZAP.COM index 47ffcbb8..60dddd4f 100644 Binary files a/Source/RomDsk/ROM_512KB/ZAP.COM and b/Source/RomDsk/ROM_512KB/ZAP.COM differ