From 3e9f114a7fc4536cb3a8769ff3a1e256bc46accf Mon Sep 17 00:00:00 2001
From: Zellyn Hunter <zellyn@squareup.com>
Date: Sat, 10 Dec 2016 22:23:36 -0500
Subject: [PATCH] Show memory; start of LC test; minor build fixes

---
 audit/audit.asm |  35 ++++++++++++++++++++++++++++-------
 audit/audit.dsk | Bin 143360 -> 143360 bytes
 audit/build     |  16 ++++++++--------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/audit/audit.asm b/audit/audit.asm
index 0a02d86..29bcc67 100644
--- a/audit/audit.asm
+++ b/audit/audit.asm
@@ -12,17 +12,27 @@
 main:
 	jsr HOME
 	jsr print
-	!text "APPLE II AUDIT",$8D,0
-	jsr print
-	!text "DETECTING MACHINE VERSION...",$8D,0
+	!text "APPLE II AUDIT",$8D,$8D,0
 
 	!zone detect {
 	jsr IDENTIFY
 	lda $C082		; Put ROM back in place.
-	lda MACHINE
-	jsr PRBYTE
-	lda #$8D
-	jsr COUT
+
+	jsr print
+	!text "MEMORY:",0
+	lda MEMORY
+	bpl +
+	jsr print
+	!text "128K",$8D,0
+	beq +++
++	cmp #64
+	bcc +
+	jsr print
+	!text "64K",$8D,0
+	beq +++
++	jsr print
+	!text "48K",$8D,0
++++
 	lda MACHINE
 	bne .known
 	;; MACHINE=0 - unknown machine
@@ -80,6 +90,17 @@ main:
 	!text "APPLE II PLUS",$8D,0
 .done
 	} ;detect
+
+	!zone langcard {
+	lda MEMORY
+	cmp #49
+	bcs +
+	jsr print
+	!text "48K:SKIPPING LANGUAGE CARD TEST",$8D,0
+	beq .done
++	
+.done
+	} ;langcard
 	
 end:	jmp *
 
diff --git a/audit/audit.dsk b/audit/audit.dsk
index d276464698d4f7879fdcb3e69a8cdd5cce48d7f4..ea43d61370119baf62d9fcd4295a4f2151b87f6f 100644
GIT binary patch
delta 733
zcmYjOQA-q26uz^o<7kAorLAqyJ``yLtq*}uA@s7@K=coqJwEsl_2jq_w&UuGh&L7n
z0^f!}VWJD0Nu(g`<PO`#o!y%|3r0Qo=!-J+5+P|vWihxM?svZL-gEdqV@EM|ltPR2
zctmrAsJIsAmeVM4pHdQ^(^$3`AJIJ5t8IN>BP<PF=MaBb{=7*^(8GuF9SA?I93us9
zE607NgSZkOF&{}i9h%1F{5=sx_*}Z2JR4H36VzMPns3z`Le#c=w?v7G`j-6NpdC5R
zH%RaUFU`GN!p4D1K_`Azm0}mp7;f>Z<$9(RI{J7Nk~%Zd1LaF1e(jLHfY&c!eggUq
z-cLX=RFJ;Tk3&%s9qbi|Ry%_NTsINrt-&QO2VJ~Hgw>xZ9v08+g!(XL8#E1!?06Xv
zQAUJkfaqex_a;FojBI;Z2nN|~@l+DX%qXf$sXM32COp-jp_5l(l=iVH$jNNloQT|%
zaTrcC-$iaLUzB81MB@F!uu8}qvM>y@;+HBB#k#dR3=4$Jir=G!u$lyW2$xhJn7zII
z(tvrtcRtgoI6kjcEw5H`Nic{0iHd{vG+o4`BLA6ciAtl6nWcdb6s{wI5w6uYxe&Zs
zwkl4w+;GaSwc%`)EZ?pBCmD^>F>RFU+Wwd(!uz_$_6`F%zV}yss%4n2CE1vkw8;}C
zjkeGX`X{J?)u)qKw`msGWD$=|s19@-7G*jGi*0lo?1Nm}Te6-5B-Uq+x$`;%S9f=@
r6?Erhi(vPg9PFQT#GhSJAH<mRVfA(jb8I(gNQZ1}CMGS#Lf!uWy3BBv

delta 732
zcmYjOPe@cj7@xOKpKDQ?DeY>|MhMnvLkb~?4z7v3{9A`^zWpwqIu&%=P1uldV(CHP
zZ3v7WHL}#ngRswilMeXaPVU>Vym<7Y3|%4?wb_+Y7(V9v{rSFczRB)Hvpdm3la}eX
zTp>0X;heZtkB1l~`Yn%ztQ7KKjreY9od=A3XPXsX4wjadl;E*NXNxoiiJu1!PV611
ztLRp?YT&M_Qel~Jj|CzB`U4{~X>lWeSHu+0IU~%kZn&W;MN00bhcfcKBL0oAR;hO<
zK{+Iqsu1PPka@=?n)0_~YokO7$?a1XhUgG*O}5pIA6T&N1|{Y>s4<uv<&pd~dHa-}
z6CV5@;^@fMBL`oOB3fI9H_J|L$adZ&bn|1H>*9%%G`rJI7T*VocKlHgF^Ysg2BMv!
z&>sg8rD)5a069SCipLUZ&}`9smOd7qWOeyT)-dTx*+(ZKXV59g*@cc?Lv>Rv?d^`<
zH}R|Oaacy^En0}focLvG=<`L*h>;u1aacfTPW+xJ=;kGG?x`Wom^~7|t|9wreBPec
zZ=MZ^U-lT1uM++Ch3?MN-z+w&mBvzM@Srt=Q`Y{VCG`E2MfVP+p}y0+W6_i~Ob4xD
z2TezxtC!(XwE}_1R1ERBid%RB=!>E{4#FwGL$GMzNmy*bQ{dEcE$`6ELr}!ZqdIpk
zodS7zcUNJuD`ya-;BSW9Zy@5&uBZ$ot{modv!*&jYgQR!wdiV6fp{2RkHEYMeYH;}
i6e9&~eSQdvnm9urfM|9yN}xQ+*lf?s9_@Wkr0XvitZtnE

diff --git a/audit/build b/audit/build
index 240eb05..af8f3c2 100755
--- a/audit/build
+++ b/audit/build
@@ -15,11 +15,11 @@ diskii put -f audit.dsk DF02:FWORLD audit.o
 
 # Also run mame? (set ROMPATH to your local variant)
 [[ -z "${ROMPATH-}" ]] && ROMPATH=~/mame/roms/
-[[ "$1" == '2ee' ]] && mame -rompath $ROMPATH apple2ee -flop1 ./audit.dsk -skip_gameinfo
-[[ "$1" == '2e' ]] && mame -rompath $ROMPATH apple2e -flop1 ./audit.dsk -skip_gameinfo
-[[ "$1" == '2p' ]] && mame -rompath $ROMPATH apple2p -flop1 ./audit.dsk -skip_gameinfo
-[[ "$1" == '2' ]] && mame -rompath $ROMPATH apple2 -flop1 ./audit.dsk -skip_gameinfo
-[[ "$1" == '2ee-d' ]] && mame -rompath $ROMPATH apple2ee -flop1 ./audit.dsk -skip_gameinfo -debug
-[[ "$1" == '2e-d' ]] && mame -rompath $ROMPATH apple2e -flop1 ./audit.dsk -skip_gameinfo -debug
-[[ "$1" == '2p-d' ]] && mame -rompath $ROMPATH apple2p -flop1 ./audit.dsk -skip_gameinfo -debug
-[[ "$1" == '2-d' ]] && mame -rompath $ROMPATH apple2 -flop1 ./audit.dsk -skip_gameinfo -debug
+[[ "${1-}" == '2ee' ]] && mame -rompath $ROMPATH apple2ee -flop1 ./audit.dsk -skip_gameinfo
+[[ "${1-}" == '2e' ]] && mame -rompath $ROMPATH apple2e -flop1 ./audit.dsk -skip_gameinfo
+[[ "${1-}" == '2p' ]] && mame -rompath $ROMPATH apple2p -flop1 ./audit.dsk -skip_gameinfo
+[[ "${1-}" == '2' ]] && mame -rompath $ROMPATH apple2 -flop1 ./audit.dsk -skip_gameinfo
+[[ "${1-}" == '2ee-d' ]] && mame -rompath $ROMPATH apple2ee -flop1 ./audit.dsk -skip_gameinfo -debug
+[[ "${1-}" == '2e-d' ]] && mame -rompath $ROMPATH apple2e -flop1 ./audit.dsk -skip_gameinfo -debug
+[[ "${1-}" == '2p-d' ]] && mame -rompath $ROMPATH apple2p -flop1 ./audit.dsk -skip_gameinfo -debug
+[[ "${1-}" == '2-d' ]] && mame -rompath $ROMPATH apple2 -flop1 ./audit.dsk -skip_gameinfo -debug