From 59ffef2bf2b9402bd467d106d9f05bcff72d0d9f Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Tue, 18 Feb 2020 18:30:17 -0800
Subject: [PATCH 1/2] Tweaks

A few things needed tweaking after the Unix build update.  No functional changes.
---
 Source/BL/.gitignore        |  2 --
 Source/BL/Makefile          |  8 --------
 Source/CPM22/ccpb03.asm     |  2 +-
 Source/HBIOS/eastaegg.asm   |  5 +++++
 Source/HBIOS/nascom.asm     |  5 +++++
 Source/HBIOS/romldr.asm     | 15 ++++++++++++++-
 Source/HBIOS/tastybasic.asm |  5 +++++
 7 files changed, 30 insertions(+), 12 deletions(-)
 delete mode 100644 Source/BL/.gitignore
 delete mode 100644 Source/BL/Makefile

diff --git a/Source/BL/.gitignore b/Source/BL/.gitignore
deleted file mode 100644
index 7e5922f7..00000000
--- a/Source/BL/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.lst
diff --git a/Source/BL/Makefile b/Source/BL/Makefile
deleted file mode 100644
index 121a1051..00000000
--- a/Source/BL/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-OBJECTS = bl.bin
-DEST = ../../Binary/Apps
-TOOLS =../../Tools
-
-include $(TOOLS)/Makefile.inc
-
-#%.COM: %.asm
-#	$(TASM) $< $@
diff --git a/Source/CPM22/ccpb03.asm b/Source/CPM22/ccpb03.asm
index 76c25121..5fef8040 100644
--- a/Source/CPM22/ccpb03.asm
+++ b/Source/CPM22/ccpb03.asm
@@ -803,7 +803,7 @@ RESETDR:LD	A,(CHGDRV)	; DRIVE CHANGE INDICATED?
 ;**************************************************************
 ;
 	.IF	MON
-MONITOR:RST	$38
+MONITOR:RST	38H
 	.ENDIF
 
 ;
diff --git a/Source/HBIOS/eastaegg.asm b/Source/HBIOS/eastaegg.asm
index 24744f11..23744cb5 100644
--- a/Source/HBIOS/eastaegg.asm
+++ b/Source/HBIOS/eastaegg.asm
@@ -17,6 +17,11 @@
 ;
 #include        "std.asm"
 
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+
 cr				.equ	0dh
 lf				.equ	0ah
 eos				.equ	00h
diff --git a/Source/HBIOS/nascom.asm b/Source/HBIOS/nascom.asm
index 76f66b9b..51517cc9 100644
--- a/Source/HBIOS/nascom.asm
+++ b/Source/HBIOS/nascom.asm
@@ -29,6 +29,11 @@
 ;
 #INCLUDE "std.asm"
 ;
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+;
 ; CUSTOMIZATION
 ;
 ABBRERR	.EQU	FALSE		; Choose between long error message and abbreviated error messages.
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index 9fb43746..5b0a9420 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -316,6 +316,7 @@ MATD:	LD	B,A
 MATD1:	CP	10		; DO A RANGE CHECK
 	JR	NC,MATX		; NOT VALID, HANDLE IT BELOW
 ;
+#IF (BIOS == BIOS_WBW)
 	PUSH	BC
 	PUSH	AF			; HOW MANY DISK
 	LD	B,BF_SYSGET		; DEVICES DO WE
@@ -323,6 +324,9 @@ MATD1:	CP	10		; DO A RANGE CHECK
 	RST	08			; SYSTEM ?
 	POP	AF
 	POP	BC
+#ELSE
+	LD	E,9		; HACK TO HANDLE UNA, NEED TO FIX
+#ENDIF
 ;	JR	MATD2		; IF MORE THEN 9	; UNCOMMENT TO TEST DOUBLE CHAR ENTRY
 	CP	10		; THEN WE NEED TO GET
 	JR	NC,MATD2	; ANOTHER CHARACTER
@@ -441,7 +445,10 @@ MENU_N	.EQU	((MENU_E - MENU_S) / MENU_V)	; NUMBER OF MENU ITEMS
 ;   SYSTEM REBOOT HANDLER
 ;==================================================================================================
 ;
-REBOOT: LD	DE,STR_REBOOT		; POINT TO MESSAGE
+REBOOT:
+;
+#IF (BIOS == BIOS_WBW)
+	LD	DE,STR_REBOOT		; POINT TO MESSAGE
 	CALL	WRITESTR		; PRINT IT
 #IF (DSKYENABLE)
 	LD	HL,MSG_BOOT		; POINT TO BOOT MESSAGE	
@@ -450,6 +457,12 @@ REBOOT: LD	DE,STR_REBOOT		; POINT TO MESSAGE
 	LD	A,BID_BOOT		; BOOT BANK
 	LD	HL,0			; ADDRESS ZERO
 	CALL	HB_BNKCALL		; DOES NOT RETURN
+#ENDIF
+#IF (BIOS == BIOS_UNA)
+	; UMMM... NEED TO DO SOMETHING HERE...
+	LD	DE,STR_INVALID	; SET ERROR STRING MESSAGE
+	JP	MENU		; AND RESTART MENU LOOP
+#ENDIF
 ;
 ;==================================================================================================
 ;   ROM IMAGE LOAD HANDLER
diff --git a/Source/HBIOS/tastybasic.asm b/Source/HBIOS/tastybasic.asm
index 3366737b..7c907dfa 100644
--- a/Source/HBIOS/tastybasic.asm
+++ b/Source/HBIOS/tastybasic.asm
@@ -40,6 +40,11 @@ TBC_LOC			.equ 0
 #else									; RomWBW
 #include		"std.asm"
 #endif
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+
 				.org TBC_LOC
 start:
 				ld sp,stack				; ** Cold Start **

From 2604212a972b353aefa5d0ca499d45692cd8da71 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Tue, 18 Feb 2020 21:05:37 -0800
Subject: [PATCH 2/2] Cleanup

---
 Binary/.gitignore                 |   4 ----
 Binary/Apps/.gitignore            |   2 --
 Binary/Apps/Tunes/.gitignore      |   2 --
 Source/Apps/.gitignore            |   4 ----
 Source/BPBIOS/.gitignore          |   6 ------
 Source/BPBIOS/NZFCP13/.gitignore  |   2 --
 Source/BPBIOS/Z34RCP11/.gitignore |   2 --
 Source/CBIOS/.gitignore           |   2 --
 Source/CPM22/.gitignore           |   4 ----
 Source/CPM3/.gitignore            |  10 ----------
 Source/Forth/.gitignore           |   2 --
 Source/HBIOS/.gitignore           |   8 --------
 Source/Images/.gitignore          |   4 ----
 Source/Prop/Spin/.gitignore       |   2 --
 Source/ZCPR-DJ/.gitignore         |   2 --
 Source/ZCPR/.gitignore            |   3 ---
 Source/ZPM3/.gitignore            |  15 ---------------
 Source/ZPM3/autotog.com           | Bin 0 -> 512 bytes
 Source/ZPM3/clrhist.com           | Bin 0 -> 128 bytes
 Source/ZPM3/setz3.com             | Bin 0 -> 256 bytes
 Source/ZPM3/zinstal.zpm           | Bin 0 -> 1536 bytes
 Source/ZSDOS/.gitignore           |   4 ----
 Tools/.gitignore                  |   2 --
 Tools/unix/cpmtools/.gitignore    |   8 --------
 Tools/unix/uz80as/.gitignore      |   2 --
 Tools/unix/zx/.gitignore          |   3 ---
 26 files changed, 93 deletions(-)
 delete mode 100644 Binary/.gitignore
 delete mode 100644 Binary/Apps/.gitignore
 delete mode 100644 Binary/Apps/Tunes/.gitignore
 delete mode 100644 Source/Apps/.gitignore
 delete mode 100644 Source/BPBIOS/.gitignore
 delete mode 100644 Source/BPBIOS/NZFCP13/.gitignore
 delete mode 100644 Source/BPBIOS/Z34RCP11/.gitignore
 delete mode 100644 Source/CBIOS/.gitignore
 delete mode 100644 Source/CPM22/.gitignore
 delete mode 100644 Source/CPM3/.gitignore
 delete mode 100644 Source/Forth/.gitignore
 delete mode 100644 Source/HBIOS/.gitignore
 delete mode 100644 Source/Images/.gitignore
 delete mode 100644 Source/Prop/Spin/.gitignore
 delete mode 100644 Source/ZCPR-DJ/.gitignore
 delete mode 100644 Source/ZCPR/.gitignore
 delete mode 100644 Source/ZPM3/.gitignore
 create mode 100644 Source/ZPM3/autotog.com
 create mode 100644 Source/ZPM3/clrhist.com
 create mode 100644 Source/ZPM3/setz3.com
 create mode 100644 Source/ZPM3/zinstal.zpm
 delete mode 100644 Source/ZSDOS/.gitignore
 delete mode 100644 Tools/.gitignore
 delete mode 100644 Tools/unix/cpmtools/.gitignore
 delete mode 100644 Tools/unix/uz80as/.gitignore
 delete mode 100644 Tools/unix/zx/.gitignore

diff --git a/Binary/.gitignore b/Binary/.gitignore
deleted file mode 100644
index 53348db7..00000000
--- a/Binary/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin
-*.eeprom
-*.img
-*.rom
diff --git a/Binary/Apps/.gitignore b/Binary/Apps/.gitignore
deleted file mode 100644
index 44b2d93d..00000000
--- a/Binary/Apps/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.com
-*.COM
diff --git a/Binary/Apps/Tunes/.gitignore b/Binary/Apps/Tunes/.gitignore
deleted file mode 100644
index 2e691325..00000000
--- a/Binary/Apps/Tunes/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pt*
-*.mym
diff --git a/Source/Apps/.gitignore b/Source/Apps/.gitignore
deleted file mode 100644
index bbe9d6aa..00000000
--- a/Source/Apps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.COM
-*.lst
-*.hex
-*.com
diff --git a/Source/BPBIOS/.gitignore b/Source/BPBIOS/.gitignore
deleted file mode 100644
index e1d7a6cb..00000000
--- a/Source/BPBIOS/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.prn
-*.rel
-*.img
-bpsys.bak
-bpsys.dat
-def-ww.lib
diff --git a/Source/BPBIOS/NZFCP13/.gitignore b/Source/BPBIOS/NZFCP13/.gitignore
deleted file mode 100644
index 567742ff..00000000
--- a/Source/BPBIOS/NZFCP13/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.lst
-*.rel
diff --git a/Source/BPBIOS/Z34RCP11/.gitignore b/Source/BPBIOS/Z34RCP11/.gitignore
deleted file mode 100644
index 567742ff..00000000
--- a/Source/BPBIOS/Z34RCP11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.lst
-*.rel
diff --git a/Source/CBIOS/.gitignore b/Source/CBIOS/.gitignore
deleted file mode 100644
index 7e5922f7..00000000
--- a/Source/CBIOS/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.lst
diff --git a/Source/CPM22/.gitignore b/Source/CPM22/.gitignore
deleted file mode 100644
index 461ebf40..00000000
--- a/Source/CPM22/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin
-*.hex
-*.lst
-*.sys
diff --git a/Source/CPM3/.gitignore b/Source/CPM3/.gitignore
deleted file mode 100644
index c493d7f9..00000000
--- a/Source/CPM3/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.sym
-*.lst
-*.sys
-*.rel
-cpmldr.com
-gencpm.dat
-bios3.spr
-bnkbios3.spr
-options.lib
-zpmbios3.spr
diff --git a/Source/Forth/.gitignore b/Source/Forth/.gitignore
deleted file mode 100644
index cfc62af0..00000000
--- a/Source/Forth/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.sym
diff --git a/Source/HBIOS/.gitignore b/Source/HBIOS/.gitignore
deleted file mode 100644
index fd4dbec9..00000000
--- a/Source/HBIOS/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.bin
-*.lst
-*.rom
-*.dat
-*.tmp
-build.inc
-cpm.sys
-zsys.sys
diff --git a/Source/Images/.gitignore b/Source/Images/.gitignore
deleted file mode 100644
index ea0c4b19..00000000
--- a/Source/Images/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.sys
-*.img
-blank144
-blankhd
diff --git a/Source/Prop/Spin/.gitignore b/Source/Prop/Spin/.gitignore
deleted file mode 100644
index aeab9be3..00000000
--- a/Source/Prop/Spin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.list
-*.eeprom
diff --git a/Source/ZCPR-DJ/.gitignore b/Source/ZCPR-DJ/.gitignore
deleted file mode 100644
index b533485d..00000000
--- a/Source/ZCPR-DJ/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rel
-*.bin
diff --git a/Source/ZCPR/.gitignore b/Source/ZCPR/.gitignore
deleted file mode 100644
index 532702d2..00000000
--- a/Source/ZCPR/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.bin
-*.hex
-*.com
diff --git a/Source/ZPM3/.gitignore b/Source/ZPM3/.gitignore
deleted file mode 100644
index 72fd99a9..00000000
--- a/Source/ZPM3/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.lst
-*.sym
-biosldr.rel
-bnkbios3.spr
-cpm3.sys
-gencpm.com
-gencpm.dat
-startzpm.com
-zccp.com
-zinstal.zpm
-zpmldr.com
-setz3.com
-clrhist.com
-autotog.com
-cpmldr.com
diff --git a/Source/ZPM3/autotog.com b/Source/ZPM3/autotog.com
new file mode 100644
index 0000000000000000000000000000000000000000..3c7a5980c7744b404e9190fa8c0e10b1149de8a6
GIT binary patch
literal 512
zcmX>c$)pe*=@;S{Va3I(px_u9;veGg&KZ)Qo}QChtWc7Xs!&{#Sdyxcp9bbQmX_oz
zIOpf)Cg!Cm1Qg}x7L;V>r6Xxo@b}|%%}Y!I=_W$4n;WM~W-+nK_4Prj3vv=Gixm<T
zl8Q1@(-bmNa|#r4Q;Ule(^FNV0(^~eSgVj(tdN&qu8<0LT#B9o#E%N)nI#ztae;co
z=uLq*HAPRw-%kMy{N3Cj3@9nc%*e-imX+Z+pP}GNCLkkSuT^O!lcELF*;z~)ii!?k
znqScaL@Qj>TFG>}OoIzVZ4=~Xk~j=veG@#-D6vy8hJlfTL0IbT!UL}sFrBn!kfH?u
E009w?DgXcg

literal 0
HcmV?d00001

diff --git a/Source/ZPM3/clrhist.com b/Source/ZPM3/clrhist.com
new file mode 100644
index 0000000000000000000000000000000000000000..02a39c830fd64cd567d6ae470075eb33c222b7ff
GIT binary patch
literal 128
dcmX@i%*babD9Cu0l_6cP_4L2v)(leg1OO4T5c2>4

literal 0
HcmV?d00001

diff --git a/Source/ZPM3/setz3.com b/Source/ZPM3/setz3.com
new file mode 100644
index 0000000000000000000000000000000000000000..4ddb374f7fde1623e0851a6b05db4e864f310a72
GIT binary patch
literal 256
zcmX?nnlZ}Q)h~>Z0SFX=BmF`gBdoZ16%>M9L!yj93}g_TT2ib~l98$q<s1;CkeXMP
zS(Klbo0?amkeHHElv-S@keLUT4|aCaLD!sLq>!3ZoT`wVlbTorR9T{snWm7JU!qV{
znwOWEmku^m4{o=DzCOrmm(1dVoWx3ywVA~VNky5dX$l#sIRy&2K<g6IQ&j|c8TmNR
pvN9Zh8_mgBwON7nHIQJq%4aC}k`XAJuGf6ASh?u9HG>p3008v<Ms)xH

literal 0
HcmV?d00001

diff --git a/Source/ZPM3/zinstal.zpm b/Source/ZPM3/zinstal.zpm
new file mode 100644
index 0000000000000000000000000000000000000000..1a6b2c4c135c490834b26ced0b91b7879c4d4570
GIT binary patch
literal 1536
zcmeHG&ubGw6n-<a6Rg;DS4*1|g=rF@ZXnXtstu(friBV74cWG6+6rxHrP3eLriW^X
z_2|iq2a7$Z_y?#o77?i!f3(&dJXi!-VWGi8*pmv1NPKI0@lfzm@!(^4@6DSx-}mvD
z$<+}x+L2UScdOCxsW!D$wqv*2TGcp2l_Bb^$aBcYNd7YkI6Uup0MhHyS!JFU9g-8Q
zyUILQL)2}|Fe4?s3|0{B84oH%d(MMyqP^gXOr07+c+=U2y|$}W_JP|WXZ#NuNT_I?
zEBfV6mY(NGU}TQ9Xls0(YOlGGIntuN;z&dsNQ0+o?H1MUP-I6T4lrgiM(R=ktX=~B
zmi~cX&~ET+*uP{YJRw@I&@<j1@5TEog(4;eTV&Ck@=u$tk7}5vvrn9jN`#`az+AyF
zjS+VMJYl+8bDQ7ei+qVc;*a?<f65o6cRWj1=o<Y-e^AOQSv9L=GCRQP82qweIc(_#
zS~3z(h@r{x^8=~T!Lea6Jv*Hm9v35%Qz8;S81;+6S)q@P4^K{r$kf2Z&PrbyF6RJT
zw&|z!_E?V)nC8AvSIgn$-qL8G&pxWh(k_<!N~Kt5S35xDq;9uCB-)nfjtLRzj1s(l
zA{GjTd_F|Z0eG62r5|O^>q-;DA*8b_-c_tA&C=Wacj|dgabp&gJ|HrV|BYQVl`$aI
zxLdWs|J!y<z~|e5jjB!Lo07Rh?+PcnlJV$vko^;wr7cw8vritv7e9AZDt~~@z6Hsg
z=ky_yL^Hd>`X#u`iCjeh;;x!f3F60tm;)?Q40uuRu)m)WJ>f(-`7=+*Z+-g#xJ%lz
Mh16{+*Zm#)33l$uwEzGB

literal 0
HcmV?d00001

diff --git a/Source/ZSDOS/.gitignore b/Source/ZSDOS/.gitignore
deleted file mode 100644
index 9823a537..00000000
--- a/Source/ZSDOS/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin
-*.rel
-*.prn
-*.sym
diff --git a/Tools/.gitignore b/Tools/.gitignore
deleted file mode 100644
index 24a162b6..00000000
--- a/Tools/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Darwin
-Linux
diff --git a/Tools/unix/cpmtools/.gitignore b/Tools/unix/cpmtools/.gitignore
deleted file mode 100644
index ccf80731..00000000
--- a/Tools/unix/cpmtools/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-cpmchattr
-cpmchmod
-cpmcp
-cpmls
-cpmrm
-fsck.cpm
-mkfs.cpm
-*.o
diff --git a/Tools/unix/uz80as/.gitignore b/Tools/unix/uz80as/.gitignore
deleted file mode 100644
index 853bc0e0..00000000
--- a/Tools/unix/uz80as/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-uz80as
diff --git a/Tools/unix/zx/.gitignore b/Tools/unix/zx/.gitignore
deleted file mode 100644
index 7b10942e..00000000
--- a/Tools/unix/zx/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.o
-zx
-config.h