diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf index 6fbe86cd..94e9229a 100644 Binary files a/Doc/RomWBW Applications.pdf and b/Doc/RomWBW Applications.pdf differ diff --git a/Doc/RomWBW Disk Catalog.pdf b/Doc/RomWBW Disk Catalog.pdf index 705718e2..da73734b 100644 Binary files a/Doc/RomWBW Disk Catalog.pdf and b/Doc/RomWBW Disk Catalog.pdf differ diff --git a/Doc/RomWBW Errata.pdf b/Doc/RomWBW Errata.pdf index b319fb6c..e756a1f9 100644 Binary files a/Doc/RomWBW Errata.pdf and b/Doc/RomWBW Errata.pdf differ diff --git a/Doc/RomWBW ROM Applications.pdf b/Doc/RomWBW ROM Applications.pdf index 91e410af..5e03bddd 100644 Binary files a/Doc/RomWBW ROM Applications.pdf and b/Doc/RomWBW ROM Applications.pdf differ diff --git a/Doc/RomWBW System Guide.pdf b/Doc/RomWBW System Guide.pdf index b33068ab..59985ff5 100644 Binary files a/Doc/RomWBW System Guide.pdf and b/Doc/RomWBW System Guide.pdf differ diff --git a/Doc/RomWBW User Guide.pdf b/Doc/RomWBW User Guide.pdf index d08cb929..0cb6cdaf 100644 Binary files a/Doc/RomWBW User Guide.pdf and b/Doc/RomWBW User Guide.pdf differ diff --git a/ReadMe.md b/ReadMe.md index e46e6ae9..1f3ff280 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,9 +1,9 @@ **RomWBW ReadMe** \ -Version 3.1 Pre-release \ +Version 3.2 \ Wayne Warthen ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \ -17 Feb 2023 +23 Feb 2023 # Overview diff --git a/ReadMe.txt b/ReadMe.txt index 553ee913..479284e2 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,6 +1,6 @@ RomWBW ReadMe Wayne Warthen (wwarthen@gmail.com) -17 Feb 2023 +23 Feb 2023 diff --git a/Source/Apps/Test/banktest/banktest.asm b/Source/Apps/Test/banktest/banktest.asm index c4e2e8f8..bb1e0f9c 100644 --- a/Source/Apps/Test/banktest/banktest.asm +++ b/Source/Apps/Test/banktest/banktest.asm @@ -27,11 +27,10 @@ runloc .equ $C000 ; Running location (upper memory required) stksiz .equ $40 ; Working stack size ; -rmj .equ 3 ; intended HBIOS version - major -rmn .equ 1 ; intended HBIOS version - minor -; restart .equ $0000 ; CP/M restart vector ; +#include "../../../ver.inc" +; #include "../../../HBIOS/hbios.inc" ; ;=============================================================================== diff --git a/Source/Apps/Test/portscan/portscan.asm b/Source/Apps/Test/portscan/portscan.asm index 47a73b5c..00953221 100644 --- a/Source/Apps/Test/portscan/portscan.asm +++ b/Source/Apps/Test/portscan/portscan.asm @@ -27,11 +27,11 @@ runloc .equ $C000 ; Running location (upper memory required) stksiz .equ $40 ; Working stack size ; -rmj .equ 3 ; intended HBIOS version - major -rmn .equ 1 ; intended HBIOS version - minor -; restart .equ $0000 ; CP/M restart vector ; +; +#include "../../../ver.inc" +; #include "../../../HBIOS/hbios.inc" ; ;=============================================================================== diff --git a/Source/Apps/Tune/hbios.inc b/Source/Apps/Tune/hbios.inc index 7a2ffea1..cba06045 100644 --- a/Source/Apps/Tune/hbios.inc +++ b/Source/Apps/Tune/hbios.inc @@ -1,8 +1,5 @@ IDENT .EQU $FFFE ; loc of RomWBW HBIOS ident ptr ; -RMJ .EQU 3 ; intended CBIOS version - major -RMN .EQU 1 ; intended CBIOS version - minor -; BF_SYSVER .EQU $F1 ; BIOS: VER function BF_SYSGET .EQU $F8 ; HBIOS: SYSGET function ; diff --git a/Source/Apps/Tune/tune.asm b/Source/Apps/Tune/tune.asm index f7339e52..994d113a 100644 --- a/Source/Apps/Tune/tune.asm +++ b/Source/Apps/Tune/tune.asm @@ -55,6 +55,7 @@ ; Main program ;=============================================================================== ; +#include "../../ver.inc" #include "hbios.inc" #include "cpm.inc" #include "tune.inc" diff --git a/Source/Apps/cpuspd/cpuspd.asm b/Source/Apps/cpuspd/cpuspd.asm index 363c4e75..722131c4 100644 --- a/Source/Apps/cpuspd/cpuspd.asm +++ b/Source/Apps/cpuspd/cpuspd.asm @@ -10,6 +10,8 @@ ; #include "../../HBIOS/hbios.inc" ; +#include "../../ver.inc" +; ; General operational equates (should not requre adjustment) ; stksiz .equ $40 ; Working stack size @@ -23,9 +25,6 @@ bdos .equ $0005 ; BDOS invocation vector ; ident .equ $FFFE ; loc of RomWBW HBIOS ident ptr ; -rmj .equ 3 ; intended CBIOS version - major -rmn .equ 1 ; intended CBIOS version - minor -; ;======================================================================= ; .org $100 ; standard CP/M executable @@ -192,7 +191,7 @@ show_spd: rst 08 jp nz,err_not_sup call crlf2 - push de ; save CPU speed for now + ld (cpu_spd),de ; save CPU speed for now push bc ; Oscillator speed to HL pop hl ld de,str_spacer @@ -204,7 +203,7 @@ show_spd: ld c,BF_SYSGET_CPUSPD rst 08 jp nz,err_not_sup - push de + push de ; save wait states for now ld a,l ld de,str_slow cp 0 @@ -219,9 +218,7 @@ show_spd: show_spd1: call crlf call prtstr - pop bc ; recover wait states - pop hl ; recover CPU speed - push bc ; resave wait states + ld hl,(cpu_spd) ; recover CPU speed call prtd3m ld de,str_cpuspd call prtstr @@ -696,6 +693,7 @@ 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 diff --git a/Source/Apps/mode.asm b/Source/Apps/mode.asm index a9815f71..0a52ee69 100644 --- a/Source/Apps/mode.asm +++ b/Source/Apps/mode.asm @@ -37,6 +37,8 @@ ; 1) Implement flow control settings ;_______________________________________________________________________________ ; +#include "../ver.inc" +; ;=============================================================================== ; Definitions ;=============================================================================== @@ -48,9 +50,6 @@ bdos .equ $0005 ; BDOS invocation vector ; ident .equ $FFFE ; loc of RomWBW HBIOS ident ptr ; -rmj .equ 3 ; intended CBIOS version - major -rmn .equ 1 ; intended CBIOS version - minor -; bf_cioinit .equ $04 ; HBIOS: CIOINIT function bf_cioquery .equ $05 ; HBIOS: CIOQUERY function bf_ciodevice .equ $06 ; HBIOS: CIODEVICE function diff --git a/Source/Apps/timer.asm b/Source/Apps/timer.asm index e8d21740..b220db1a 100644 --- a/Source/Apps/timer.asm +++ b/Source/Apps/timer.asm @@ -25,6 +25,8 @@ ; ToDo: ;_______________________________________________________________________________ ; +#include "../ver.inc" +; ;=============================================================================== ; Definitions ;=============================================================================== @@ -36,9 +38,6 @@ bdos .equ $0005 ; BDOS invocation vector ; ident .equ $FFFE ; loc of RomWBW HBIOS ident ptr ; -rmj .equ 3 ; intended CBIOS version - major -rmn .equ 1 ; intended CBIOS version - minor -; bf_sysver .equ $F1 ; BIOS: VER function bf_sysget .equ $F8 ; HBIOS: SYSGET function bf_sysset .equ $F9 ; HBIOS: SYSGET function diff --git a/Source/Doc/Basic.h b/Source/Doc/Basic.h index 4cf403cd..8c415f6b 100644 --- a/Source/Doc/Basic.h +++ b/Source/Doc/Basic.h @@ -1,4 +1,4 @@ -$define{doc_ver}{Version 3.1 Pre-release}$ +$define{doc_ver}{Version 3.2}$ $define{doc_product}{RomWBW}$ $define{doc_root}{https://github.com/wwarthen/RomWBW/raw/dev/Doc}$ $ifndef{doc_title}$ $define{doc_title}{Document Title}$ $endif$ diff --git a/Source/ver.inc b/Source/ver.inc index bf79f9f6..5bea2be7 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -1,5 +1,9 @@ #DEFINE RMJ 3 -#DEFINE RMN 1 -#DEFINE RUP 1 +#DEFINE RMN 2 +#DEFINE RUP 0 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.200" +#DEFINE BIOSVER "3.2.0-rc.0" +#define rmj RMJ +#define rmn RMN +#define rup RUP +#define rtp RTP diff --git a/Source/ver.lib b/Source/ver.lib index 3a0b8d52..1844eb1a 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -1,7 +1,7 @@ rmj equ 3 -rmn equ 1 -rup equ 1 +rmn equ 2 +rup equ 0 rtp equ 0 biosver macro - db "3.1.1-pre.200" + db "3.2.0-rc.0" endm