From 8f408c8bbb1582dbebd7d2cdb0f7389da059971a Mon Sep 17 00:00:00 2001
From: Dave Schmenk <dschmenk@gmail.com>
Date: Mon, 26 Feb 2018 19:32:20 -0800
Subject: [PATCH] more robust MB check

---
 PLASMA-SYS1.PO              | Bin 143360 -> 143360 bytes
 src/libsrc/apple/sndseq.pla |  22 ++++++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/PLASMA-SYS1.PO b/PLASMA-SYS1.PO
index 29003b1f4da3d651216be8e6c45103adfb69badf..0437ae0e35da7fcbce78345146f6c9ce5f34a118 100644
GIT binary patch
delta 1440
zcmYM!e@xVM9LMp`=gV>Ty#wNV-&3KpLsJ5|a57=pj4fA8*C1lM8#YR%t!!Y^QHva!
zci#<*b@K=L<Li$iJ>t;I5+>~EhYh2`Ymy`;{#?hPxmYrtl9nTTt{>}<$NT;IzQ2Eb
z{&;`B-(W%wCe)5=liFyysLJ-ZR52?44#%b@lMX$Um7=^PM7o|P+T48uUk_dIeH%aZ
zP5hY?XZn4@lDWnibKY_8kV>)nLW`W7{%Ggb0_%5!zrS-`xp6h}^RB_eVpp&E>IZVG
zt$Lzd3?@xP4oJncg=L9cW0r-b#}jkDXkGu)y(-(Yid-%HB~Gup<iDP6Hic!LMG;ks
z*&UX%v>JU=NGsDtZAkM56@QI67M2D7PF?>`vs>j@n%7mkMJrPU)$ff>|4@D+Q+4;s
zdkwi-MY8ZW#!k1%h?I9?_3d)MwCV1DrkRJOQ#wMfhM8K0Dsn7lVN|Y={bqAiKAg5d
zZ}4b2rFz3GEhpWKM`gZ@n!iP5(R|%4ltx%Gg_5odWdTZ2gDAW%p@h(XKiypZk(?XI
zP(<@QCB=9`5k@uE;SI!b3TJR0mtap4Mk;h<VkU}Ej1oMJO02@mSc`gW!rR!6o!E;O
zv?hswafomP9q2+2zCbVfa1sL;#t6o76MtX|!XgYS?8rbayeL2+7GoJIP>bEzhc<Lr
z0vtlPh+lCVcafYd3>Eib4)TzXLOg;eu@pX3q8h953SL7!-b4^vupRH?0NU{}j-e+&
zIgUOIU<kvwgb|G47Hn2wJb*kDp%_o09Lup1b$AOq(1Lb!;ZuBtI4<J`{)F8ojKDNX
z24-VE7UD51MHzgkL={$`78|h{+wdM*5y250MK^lzB~G9p-{S`i<029mwXy$S2otys
zp$dbK-<XRW<RKr0Sb|DaqY3X~H})fpZk)t9T)_w?a2L|f9YHFb$bcIjJNutQn1{tE
zK`F}N!*f`LI&44)Td@;+5Jm)@_#78-83~NzIwm0;!brgkWZ^;N!W*D0!sGDcdDLJn
z>hL<&V<Uptj3#WuK8I*N=&&|N9Mb6IxeGCThU4hveZpZe#>v-k3sbPBuzNTmr<v=H
i%0+3qd*H{Rc;C?3(-mr?nS53*R6=fksacT@8T<>z(2ZUI

delta 1436
zcmYMxe@xVM9LMp`=X=N9ad>fe<YjjfG!!P-Bu;59SZ?B$8w$fKjbYfr6X_R2%XVuX
z-z_V3P%QAPGb0ZLIf#QXW4d4<N`r76khZdoGa!S7b1`zZ=z8{J>yO9h^LoGE|GnSU
z5mR-<)H%Os{W)F~uS$$d5mVxy(7m*%JHI+DPT3=b!)_5B&cSO}CcfJ~G(38BxL{!X
z%k9FlqRQ51i`qVtN{;s8CvtIR*X>NhNcjHIySiZ4?ej;QXGR*r^<%A~p}%23d%028
zHh(G=<L*1#L|Av{ctGamR@ut*Z%syvV|E&K<&)7@4C(z2YOnArUcIN!R%ZBnYTRj%
zUg62J9nc+6%5-Il{xyBNd86hJ$TfO{C^l&A0hwg2v>!TV&9{q+W7hO)#Z#%>49Lv?
zx(WYxT}^V@;!dcjvF4iuugBf9?5ymN%UsSEqP{e1VT|z9^bDPo%~D2tUTu-5q|xR4
zw;SIoZPHwy;B#3EO(NBzr3d9M8P?tp$_z`k-Ir)hEwcNPtf>yIKPcDAZf!m&*FWZR
z3Z({?6+&^?g_4aTRH7U11fkR;{4l?^txcx*A5lczIwelsq6l>_-o!Yr<0ful8g`vf
zm&1ieu?o4^jIDSMr6@-w4#JQ3@F7m(Gy-TrJGykjtzIBpL@x$#6~h?C7;YefIV|80
zopz>BI{e9cp=QF3Cy|3qD8%#Fk47}10~axhDJ(+72vv^<V8cVmKo&M22Tvm(1t>u&
z_Tlvy;aA@vybV9z#St9GNi?Gso%kGIU;slH#SQ#`2&OTIc`U(d5bA1VAs3rbgdNz8
zz3>_QLj8d7F<Q`xUR=gk7{?5LhtbISkcecgK{lR39t!X*N>GZI;KhC%MlDX@9NH1W
z1?}=@GQmGW4C7mTj|iqPi(l|7?m?J@8jF=!i*?At2IOE1O0f@hIE6->MH~7shDrQ{
zIovaG1bwVf&4|ZxIFXDLq#^^4V-vQ*gB>VA8Oq_qJE(_-(>Q}Rgm4L0@FQk0iv`?|
z<p_TgV$DK*5J^ZwIx^wLMm&RE*n=t@gb#<H;xLY&7Iip*CbOsunhkX!vs5op_o5$z
z7{V~~*<`a`U7+|4OEAQ-3E1I8qE-=-Pgq>eYu6`+2PeMyy3kakb%bP=tk-UZq_eqG
GR{sTEYMJc-

diff --git a/src/libsrc/apple/sndseq.pla b/src/libsrc/apple/sndseq.pla
index e0da4aa..152d951 100755
--- a/src/libsrc/apple/sndseq.pla
+++ b/src/libsrc/apple/sndseq.pla
@@ -213,7 +213,7 @@ asm psgWrite(pVIA, reg, val)#0
         INX
         RTS
 end
-asm viaCheck(pVIA)#2
+asm viaCheck(pVIA)#1
         PHP
         SEI
         LDA     ESTKL,X
@@ -223,23 +223,18 @@ asm viaCheck(pVIA)#2
         STX     ESP
         LDX     #$80
         LDY     #$04
+        SEC
 -       LDA     (TMP),Y
         BMI     +
         DEX
         BNE     -
         TXA                 ; TIMEOUT
         BEQ     ++
-+       TAX
-        LDA     (TMP),Y
-++      TAY
-        TXA
-        LDX     ESP
-        DEX
++       SBC     (TMP),Y
+++      LDX     ESP
         STA     ESTKL,X
-        STY     ESTKL+1,X
         LDA     #$00
         STA     ESTKH,X
-        STA     ESTKH+1,X
         PLP
         RTS
 end
@@ -404,13 +399,8 @@ end
 // Search slots for MockingBoard
 //
 def mbTicklePSG(pVIA)
-    byte tmrBegin, tmrEnd
-    word tmrDiff
-    
-    tmrBegin, tmrEnd = viaCheck(pVIA)
-    tmrDiff = tmrEnd - tmrBegin
-    //puts("VIA address: $"); puth(pVIA); puts(" Timer Diff = "); puti(tmrDiff); putln
-    if tmrDiff == 10
+    //puts("VIA address: $"); puth(pVIA); puts(" Timer Diff = "); puti(viaCheck(pVIA)); putln
+    if viaCheck(pVIA) == 8 and viaCheck(pVIA) == 8 // Check twice
         pVIA->IER  = $7F  // Mask all interrupts
         //pVIA->ACR  = $00  // Stop T1 countdown
         pVIA->DDRB = $FF  // Output enable port A and B