From 214ed545843b964cda4945f5919aa95ac5b3b06a Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sat, 5 Feb 2022 11:54:46 -0800
Subject: [PATCH] Miscellaneous

- Fix build under Windows (credit to Dean Netherton for finding this).
- Fix ReadMe.md file format to remove superfluous junk at top.
- Improve RAM size detection (work in progress, not part of normal build).
---
 Doc/ROM Applications.pdf       | Bin 193897 -> 193897 bytes
 Doc/RomWBW Applications.pdf    | Bin 241324 -> 241324 bytes
 Doc/RomWBW Architecture.pdf    | Bin 451608 -> 451608 bytes
 Doc/RomWBW Disk Catalog.pdf    | Bin 134794 -> 134794 bytes
 Doc/RomWBW Getting Started.pdf | Bin 272671 -> 272671 bytes
 ReadMe.md                      |  41 ---------------------------------
 Source/Apps/cpuspd/Build.cmd   |   2 +-
 Source/Doc/Build.cmd           |   2 +-
 Source/HBIOS/hbios.asm         |  35 ++++++++++++++++++----------
 Source/ver.inc                 |   2 +-
 Source/ver.lib                 |   2 +-
 11 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/Doc/ROM Applications.pdf b/Doc/ROM Applications.pdf
index 26d4f1a67644222392be853f11ccd23f757325e4..6f67aa2cc7a53ee8dddd1520722ee5bbee0f3916 100644
GIT binary patch
delta 115
zcmaF)iu>g&?uHh|ElkUgvsxIKo0?7bV;AQ!GBN-{L$JX1^T(O2be)ZyoDH0eolH$k
loz0wGEL@!oT-=Nt&CN~B+#HQv-AwEhYzQft?(>yN768>@AKw4~

delta 115
zcmaF)iu>g&?uHh|ElkUgvzi&17#d9WV;AQ!GBN-{L$JX1^T(O2be%07EiDa9oDH2^
l%?vCo%#9qKEzAv^jm?}*Tun`lObqN4YzQft?(>yN767t19{m6S

diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf
index 9810891d98d568daf230a332ad2c37fe88eb20f6..a64d5d210b2446a2f12b98c5b684b7627ee0c97a 100644
GIT binary patch
delta 111
zcmZ2;mv7BozJ?aY7N#xCYPqZy2Ij`*)3tM%<si)Me!0y59Gop24NRS!-As)P-Q0|g
hT^ub9U5$-REM1+Pjm+IFj9ly#YzQft-oK7n769ib9ku`f

delta 111
zcmZ2;mv7BozJ?aY7N#xCYPqatM#iRw)3tM%<si)Me!0y59Gs1u+?))|jh!4VO<YV|
gjVujJ3>_T}T^&t<go&Ghxt)RyAtlrM*D=ci0Ne*1b^rhX

diff --git a/Doc/RomWBW Architecture.pdf b/Doc/RomWBW Architecture.pdf
index 34cf545aa53c8220b7d341bb6c42a6e7a0d5f5dc..9e3dbb91db856309ece44910363785f8aaab87d8 100644
GIT binary patch
delta 174
zcmbPnLVCst=?$_u0*QtOMiwTiW~s(zNhX#lsm;1M+jVmoZ*^eEw2Oab1Y#y2W(H!G
z?c!fqyVtN-7?_((chF{%n7(fz8#^nAYrOr`Lbi8~&aO^Q=7x@rCa#vwmKLr?uFlS8
c7ETuCmTneC7OswtMs^A|gp^GG{g_P_06ZTxD*ylh

delta 175
zcmbPnLVCst=?$_u0?8J}rm3bD1_lO}78a&v#?87p+jVmoZ*^eEw2Oab1Y#y2W(H!G
z?c!fqyVtOq85x_JPj}R25}&?rAsah{zx~ugws(%sCZ;YHt}aGq=1#`0X2zzDmPY2L
b7Uph7E>5m4PR8bLb_zCxluZBqm`xS{lMFMN

diff --git a/Doc/RomWBW Disk Catalog.pdf b/Doc/RomWBW Disk Catalog.pdf
index 2ae54ac0efd175f42e69263f769dec81937d15bd..7a3c3a43de979ac5e4927731b4bdd8f9158948aa 100644
GIT binary patch
delta 107
zcmeC0%h5HLqhSl<if^nI2Ii&))7O4ul!Gw0U--rtCGKotWMbrE<Y;1PW^U}{=xAx|
d;%wq*?CRubZe(O?Zf0PoU_(gB^jtnBSpe2<9O?i7

delta 107
zcmeC0%h5HLqhSl<if^oDMkWR()7O4ul!Gw0U--rtCGPBE>Fi?QVrb#)Y-Z_f;b>xN
dVP@=R;b`dU<ZNo_<m_grU_(gB^jtnBSpe_D9iRXJ

diff --git a/Doc/RomWBW Getting Started.pdf b/Doc/RomWBW Getting Started.pdf
index 0158aa4a50ad4add37c05b483d7059d4ca6102c9..a677da60749b44684477d6b09f1606dd18ed79ec 100644
GIT binary patch
delta 141
zcmbP#NnrjZfrb{w7N#xCZ$GhG7?>LyOfFy-=P@!e0765sz;@Bk%&SZj932ge&77Rw
zTrEt^OpFXHEL{zpja|*%T;0r#9gR%P>=bMWDv4FFv*Ri*Nh~U<C`wJ^GBUNWG_vGU
KRdw}u;{pIS-6fv@

delta 141
zcmbP#NnrjZfrb{w7N#xCZ$Gh`85x_HOfFy-=P@!e0765sz;@Bk%&SZj+$`OkoeZ6g
z9Zd~gTnsIo&5SKfEu7s9OiWA+oD5tH?G$VXDv4FFv*Ri*Nh~U<C`wJ^GBUNWG_vGU
KRdw}u;{pIS3?+pC

diff --git a/ReadMe.md b/ReadMe.md
index b8fa89eb..8807e9c5 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,44 +1,3 @@
----
-author: "Wayne Warthen (mailto:wwarthen@gmail.com)"
-classoption:
-- oneside
-colorlinks: true
-date: 02 Feb 2022
-documentclass: book
-fontfamily: helvet
-fontsize: 12pt
-geometry:
-- top=1.5in
-- bottom=1.5in
-- left=1.5in
-- right=1.5in
-graphics: true
-header-includes:
-- 
-- 
-include-before:
-- 
-- 
-institution: RetroBrew Computers Group
-linestretch: 1.25
-numbersections: true
-papersize: letter
-secnumdepth: 1
-title: RomWBW Getting Started
-toc: true
-toc-depth: 1
----
-
-
-
-
-
-
-
-
-
-
-
 # RomWBW
 
 ## Z80/Z180 System Software
diff --git a/Source/Apps/cpuspd/Build.cmd b/Source/Apps/cpuspd/Build.cmd
index 19b3439e..1e3fe0a5 100644
--- a/Source/Apps/cpuspd/Build.cmd
+++ b/Source/Apps/cpuspd/Build.cmd
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set TOOLS=../../../../Tools
+set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
diff --git a/Source/Doc/Build.cmd b/Source/Doc/Build.cmd
index 34316376..dad1f07f 100644
--- a/Source/Doc/Build.cmd
+++ b/Source/Doc/Build.cmd
@@ -51,7 +51,7 @@ gpp -o %1.tmp -U "$" "$" "{" "}{" "}$" "{" "}" "@@@" "" -M "$" "$" "{" "}{" "}$"
 pandoc %1.tmp -f markdown -t pdf -s -o %1.pdf --default-image-extension=pdf || exit /b
 pandoc %1.tmp -f markdown -t html -s -o %1.html --default-image-extension=png || exit /b
 pandoc %1.tmp -f markdown -t dokuwiki -s -o %1.dw --default-image-extension=png || exit /b
-pandoc %1.tmp -f markdown -t gfm -s -o %1.gfm --default-image-extension=png || exit /b
+pandoc %1.tmp -f markdown -t gfm -o %1.gfm --default-image-extension=png || exit /b
 pandoc %1.tmp -f markdown -t plain -s -o %1.txt --default-image-extension=png || exit /b
 
 goto :eof
\ No newline at end of file
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 0e4b9e30..30c8349c 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -456,11 +456,10 @@ HBX_ROM:
 	JR	Z,HBX_ROM		; IF NOT SET, SELECT ROM PAGE
 ;
 HBX_RAM:
-	RES	7,A			; CLEAR BIT 7 FROM ABOVE
+	AND	%00011111		; AVOID WRAPPING BITS
 	RLCA				; SCALE SELECTOR TO
 	RLCA				; ... GO FROM Z180 4K PAGE SIZE
 	RLCA				; ... TO DESIRED 32K PAGE SIZE
-	AND	%11111000
 	OUT0	(Z180_BBR),A		; WRITE TO BANK BASE
 	LD	A,N8_DEFACR | 80H	; SELECT RAM BY SETTING BIT 7
 	OUT0	(N8_ACR),A		; ... IN N8 ACR REGISTER
@@ -480,9 +479,9 @@ HBX_ROM:
 	JR	NC,HBX_BNKSEL1		; IF NC, WANT ROM PAGE, SKIP AHEAD
 	XOR	%00100001		; SET BIT FOR HI 512K, CLR BIT 0
 HBX_BNKSEL1:
+	AND	%00111111		; AVOID WRAPPING BITS
 	RLCA				; CONTINUE SHIFTING TO SCALE SELECTOR
 	RLCA				; FOR Z180 4K PAGE -> DESIRED 32K PAGE
-	AND	%11111000
 	OUT0	(Z180_BBR),A		; WRITE TO BANK BASE
 	RET				; DONE
 #ENDIF
@@ -1077,13 +1076,18 @@ Z280_BOOTERR	.TEXT	"\r\n\r\n*** Application mode boot not supported under Z280 n
 	DI				; NO INTERRUPTS
 	IM	1			; INTERRUPT MODE 1
 
-;#IF ((PLATFORM=PLT_MBC) | (PLATFORM=PLT_SBC))
+;#IF ((PLATFORM == PLT_MBC) | (PLATFORM == PLT_SBC))
 	; INITIALIZE RTC LATCH BYTE
 	; FOR SOME PLATFORMS THIS CONTROLS HI/LO SPEED CIRCUIT
 	LD	A,(RTCDEFVAL)		; GET DEFAULT VALUE
 	OUT	(RTCIO),A		; SET IT
 ;#ENDIF
 ;
+#IF (PLATFORM == PLT_N8)
+	LD	A,N8_DEFACR		; ENSURE N8 ACR
+	OUT0	(N8_ACR),A		; ... REGISTER IS INITIALIZED
+#ENDIF
+;
 #IF (DIAGENABLE)
 	LD	A,%00000001
 	OUT	(DIAGPORT),A
@@ -1375,31 +1379,34 @@ RS_START:
 	PUSH	AF			; SAVE IT
 	
 	LD	C,0			; RUNNING BANK COUNT
+	LD	HL,$7FFF		; BYTE TEST ADDRESS
 	LD	IX,RS_ARY		; ORIG BYTE STORAGE ARRAY PTR
 RS_LOOP1:
 	LD	A,C
 	ADD	A,$80			; OFFSET BY START OF RAM BANKS
 	CALL	HBX_BNKSEL		; SELECT THE BANK
 
-	LD	A,($7FFF)		; GET ORIGINAL VALUE
+	LD	A,(HL)			; GET ORIGINAL VALUE
 	LD	(IX),A			; SAVE IT TO RESTORE LATER
 	INC	IX			; BUMP IX
 
 	LD	A,$AA			; TEST LOC WITH $AA
-	LD	($7FFF),A
-	LD	A,($7FFF)
+	LD	(HL),A			; AVOID PROBLEMS WITH
+	LD	(HL),A			; ... DS1210
+	LD	(HL),A
+	LD	A,(HL)
 	CP	$AA
 	JR	NZ,RS_DONE
 
 	LD	A,$55			; TEST LOC WITH $55
-	LD	($7FFF),A
-	LD	A,($7FFF)
+	LD	(HL),A
+	LD	A,(HL)
 	CP	$55
 	JR	NZ,RS_DONE
 
 	; STORE A UNIQUE VALUE
 	LD	A,C
-	LD	($7FFF),A
+	LD	(HL),A
 	OR	A			; ZERO?
 	JR	Z,RS_NEXT		; SKIP STORED VALUE CHECK
 	
@@ -1410,7 +1417,7 @@ RS_LOOP3:
 	LD	A,E
 	ADD	A,$80
 	CALL	HBX_BNKSEL
-	LD	A,($7FFF)
+	LD	A,(HL)
 	CP	E			; VERIFY
 	JR	NZ,RS_DONE		; ABORT IF MISCOMPARE
 	INC	E			; NEXT BANK
@@ -1422,6 +1429,9 @@ RS_NEXT:
 ;	
 RS_DONE:
 	LD	E,C			; FINAL BANK COUNT TO E
+	LD	A,C
+	OR	A
+	JR	Z,RS_LOOPZ
 	; RESTORE SAVED VALUES
 	LD	IX,RS_ARY
 	LD	B,C			; LOOP COUNT
@@ -1431,9 +1441,10 @@ RS_LOOP2:
 	CALL	HBX_BNKSEL
 	INC	C
 	LD	A,(IX)			; GET VALUE
-	LD	($7FFF),A		; RESTORE IT
+	LD	(HL),A			; RESTORE IT
 	INC	IX
 	DJNZ	RS_LOOP2		; ALL BANKS
+RS_LOOPZ:
 ;
 ; MBC RUNTIME MEMORY SIZE ADJUSTMENT
 ;
diff --git a/Source/ver.inc b/Source/ver.inc
index 6c0cd517..fd73e28a 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.154"
+#DEFINE BIOSVER	"3.1.1-pre.155"
diff --git a/Source/ver.lib b/Source/ver.lib
index 661456a8..c16db76f 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.154"
+	db	"3.1.1-pre.155"
 	endm