From 54bce84745c7493c5f19235f1b28a112a8b08586 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 24 Sep 2022 00:19:04 -0400
Subject: [PATCH] Detect ZipChip before attempting to change settings.

---
 applecorn.po   | Bin 819200 -> 819200 bytes
 auxmem.oscli.s |  28 ++++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 847d97556081f379c100cf6cf63c23cc0aa2b916..00cadb629f788b73ec102fcc3c3afecce0b81e95 100644
GIT binary patch
delta 1242
zcmZuwe@q)y9KUxhZFz&N3ofZ(=F22Vk!462LzK$zz;+vq=s+!_CMH86X8)L}iQ^0_
zPPR5+Odc+yHq|yBvB0+AL2%MUK-#idL=(3#An0V#-u3Q^TLz5!+8LLa-RJwce7?W#
zUGn`tmd$6`{9(IVKW3te_M}i0`x{jn7o86EM-DY0qzP4oaX*PrL#QRx5hn8vHRO6V
zx9oz-CG&^U;YqNYjXR26R2AjE*Tg*by{>&r_3q$VA2An9<oG`@tcGdksCQSBtvTvV
zZ?YYWdNZ1AE%-$j3<C$B`vu&WtTRW)sNT=aYy6veuok4s))%;PYYAtznz#x)@hm*h
zF|PDebU=UCTj(>gw(>co$mpzyF8+)RbDS25F|-=<+%xEqU$&p4Im&vUW35}xWb~<W
z`aa1K%jN(>u><b4nr_cMQkSb?^%|sN2c#s=T0k$f-WVX!^==Dibk3om#H_|7l?z&^
zyJaW%GlQ@kfDs%Vf<qaNQf4ggaerFKVAK1&luy4=%ldanTGS}va|ICbBg60%0LS@)
zOR!f38u{rFSgJKHNgQPv1mJuVXR%IlQR@_!YMpUX7bpG8JvwgPxkOGaLYiePmBNGg
z{VVVn5aH{;gW2H7v8Z5<4tQIlLUZ&hjzZNdt`D3mC?E}*qhB{iA4EExD@;J@@}CY^
zgUB0mwI?dxn9=yN0$D-Vj8lhFWY;^1D%@QGck!ze@Q50O@pF^#N4h}7<2CRZyl)C_
zfgmoJhKIot?wp2h;OC7$!0mK3+8svPaF53JnvW?6+sr--$39W$yFdo=Z|1_QiA=N4
z;x+qfW2EG&*%wOrPtipd1AfI1Gdhw)AZiJc2%ZxD5BevY^f30Z)Gf73`C^Z>Kaws!
zDP|H}nP=xW6Me=+|9t39=wZjB)x@vKVwun{xCOV4ygb5nVGD2gVR_N>Ve7_NaoD=<
zj(jP5q~Rno7cvZ!@K$zC>!{@hx)bt9e$d(z$y}~iq5YyOmff0b67a@BSVo@|u!(_B
zYXu>cg)R%Yoq@TuAmH;1Y)(Jw6qmJ<nrm^2WWeqSibz~*LgO8WU<URCAxisD>~D)N
zxXWj^)8xBIE#d1y_%b+!_s+t~okQY4U!KNE_0Y}?%QA3L!#mM&d}fv$u99$Y7QPL>
z!Npf$U)<eW2kTQJQg_V(@))<HO`LZPj;5J}6DqD_bSCMR!9uP<AK7=jaSb|Xzl_86
zu%zRXQz3tdK2aXr7-mRGt!ikfYbZvPL-}0kC1_b)3{QsJL{3yM7T?@<^Y?|Wg_4D-
zMThbzFn@;_heDQ;Nx97&y&c!YA`<f_iO573jw{T!GV|9QBg+h|keQccrcGox{CWuP
mN$XXH6oZnJQ+2qquDYVGvMML%GN6lrXH$*36zEa5+5Z7S{b*$X

delta 1198
zcmZuwaZD3e9KO4jwme6uGByf^yd{poh7k$U!jxgj5cL>HvV~2J{lhIx+2%jXhRNg>
zC|eraK(_FhQM^>z?3xvEnK^NBG#N13;wWQ_n?Y=tOHJ%uU++*O47ykR!({Qk_r3gn
z-~HaZm*0Jl<H|X%e8i<SeqBSEx0;@(xWB2|bkH@Z{bEo{6EcJv!gQWNs3X)98VEDR
zK`jvabOD#7aVN#beDDdKb1<DKE?HwK?Pz76{n^mIhHCnONyG^31UY8aU)bujsQ&y`
zXO-$NXmwVj*W4gZcZj7Iz>Z9VSskVNzA-O}@0WqSbk?+er(m`363q4*p$?602m3nv
zm2(smGCuTI21+=mbrxPv!uMo&>35hnE9jw|g0YnMQJw(~C0(Z(fwHd(oPCYYgdZv0
ztK=OS#RAPzoX@k=;P5^ob)`DasDm2LhcmoOA*0lG(?`^0hfOHqXQ3Cfu@u(0fsJ~&
z`-J%AFtE~eFA84-7YoYqmQ<N3m=no!8UubRU|iYD1vg?nEXU|{1%Tq^5pas8tzyOZ
zpie`Wi<6f@t-j<c7AV^=O`mBMUbT-4s(nJpvQP2UrSV|2*B~tOx5-y6P!~nG7VJkS
zuYo`4kl6eaD5eiosghas`KwjQqJAq-uzu0~8NUcUc-X9dXHg$3UHl^J!9Bt5kUb3j
zDR=vN#nCBUuqad%c2DsJ7{l(5*Q=1D4it*9F>pXj$57Qcm|?PI^kV~f1?`vsYqS?t
zOoBJ)tEg)dc<3Rq<QI_5yx=?(fUEbM2LmuWZWFl8m4UO?S?A%jc=nyNh)xATL1$E&
zmlg@41Z(mCgZZruKhcijckv#aB_GF|68EKLDMfH?j+?u&zEUfvE9W8)B2QL4JsSJ-
zj<i|&RN^GgK&H>7AEdt!3<0a<xww60G&gQv_9TXqUObXPT2A_Gl8zO>+;+uw6F!J|
zagc87O>BuaYv3l?ohoiCHA!e?KiJK*NT`MdFX^YGND*{NsGS9+%#?)Au;6h1c3zI^
zu~w+&W%BPl2^hjc-Fl2RHi7~a4g;8TNIrKw?Ok`k<zmRb@OA>Ng~6N5+X>`rBn{`L
zL0+yy_6?Njc&eA-3v5x^O^xJ2EAmg1BP=8ko(3P%edx$_Fpy5SHG$@=5Oy@|BTq>-
zyg`iD1RBwWU%{~)lXOBObY7Xt_$SXs+&(~Tjo=Izq=(Sh45;aJ@(MXD{6KkpFIb0?
z^?FN7Q%g0ZI+T-2JHe6IX#9M<UhbB)3)Qza+`2R0GrwzoVxdEM8rb_0wnHJ-W1qRp
zzI8VplM%w~1i3_*#FhODi<0cUS#~<fg2E)bEy>o)Y&YtOfUUZA#i6K4aWn$<&|evu
P7rp;#VUGg5$_CeeEii6P

diff --git a/auxmem.oscli.s b/auxmem.oscli.s
index ac32ade..f6a6068 100644
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@@ -759,10 +759,12 @@ EXEC         JSR   LPTRtoXY
 FAST         LDA   #$80                      ; Apple IIgs
              TSB   $C036
              STA   GSSPEED
-             STA   $C05C                     ; Ultrawarp fast
              JSR   UNLOCKZIP                 ; ZipChip
+             JSR   DETECTZIP
+             BCC   :NOZIP
              STA   $C05B                     ; Enable
-             JSR   LOCKZIP
+             JMP   LOCKZIP
+:NOZIP       STA   $C05C                     ; Ultrawarp fast
              RTS
 
 *
@@ -771,12 +773,30 @@ FAST         LDA   #$80                      ; Apple IIgs
 SLOW         LDA   #$80                      ; Apple IIgs
              TRB   $C036
              STZ   GSSPEED
-             STA   $C05D                     ; Ultrawarp slow
              JSR   UNLOCKZIP                 ; ZipChip
+             JSR   DETECTZIP
+             BCC   :NOZIP
              STZ   $C05A                     ; Disable
-             JSR   LOCKZIP
+             JMP   LOCKZIP
+:NOZIP       STA   $C05D                     ; Ultrawarp slow
              RTS
 
+* Detect a ZipChip
+* Set carry is ZipChip found
+DETECTZIP    LDA   $C05C                     ; ZipChip manual p25
+             EOR   #$FF
+             STA   $C05C
+             CMP   $C05C
+             BNE   :NOZIP
+             EOR   #$FF
+             STA   $C05C
+             CMP   $C05C
+             BNE   :NOZIP
+             SEC
+             RTS
+:NOZIP       CLC
+             RTS
+           
 * Unlock ZipChip registers
 UNLOCKZIP    PHP
              SEI                             ; Timing sensitive