From b260002b4dee3bb9c2dad93c50c2f827314ebbfa Mon Sep 17 00:00:00 2001
From: Martin Haye <martin.haye@ucop.edu>
Date: Sat, 27 Feb 2021 11:14:25 -0800
Subject: [PATCH] Patched to check for real drive data, so we don't spin
 forever waiting for disk 2.

---
 Platform/Apple/tools/ProRWTS/PRORWTS2#4000 | Bin 2150 -> 2186 bytes
 Platform/Apple/tools/ProRWTS/prorwts2.s    |  19 +++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/Platform/Apple/tools/ProRWTS/PRORWTS2#4000 b/Platform/Apple/tools/ProRWTS/PRORWTS2#4000
index bbc1372d35071fa78af675a4b9aa4041d60fcff7..3d5b80d2c6101ab42c6e8b321acc6795dbc9edac 100644
GIT binary patch
delta 723
zcmXAlZAep59LDd<rjsnJ@P)#55DOhxVOeHcd3D=yuJS_#eThM!`zRD>6!=2RY4_Y5
z7ov#jIvjXM6Cp77VR*w94noh)l<4hKF>Zt8hODxfc2;oC`TfuH{Lga^CtWhOvkQ!F
z0(moXcphCBP&2IUMeBA{?LbWq)Z>6fgJ`9_$d7silxahALRgp12vTFaE(vsY3c6&o
zOZ9fC$u1$g^vEtv1-h*4oj`9@@ldGat84sI<Tjl41)emT1{~5*;JtUC6Had}OD<?J
zxEbF4u~iYpdZ@0TS59;Us!0@gqN8w8Y=mM9#e!38fGR=9A!^F=G*k-3W7IeS)et%f
z)pq)5)r?L-UDs)9kdyiZl|lUiVCDy}2`Y=+P|cw8aP1ZZ9Z;z&iTdC>p9>p)oK?Nl
zP<eDVAAJr+?rL-d1?5JK#V`dOO253uUKB=1s2t@|)B;xsm?g#zbrHprD&w;Tt3WYX
z(@DgyA&V9n(mX7~@yTJxG47`r%q4@I%7BFI<6P{rjJdYLByorEGhN=pPqGPlp5M#9
zl|S&8yJm?cGO87D<7~#kMaQ%^Ixz}Gozy6dr3Ul=Z^mY?*WHYRjKY8!l2|pi>G;PY
zUjL`&l`ziaaUXw{J*GO_1rqHepqqqBE5IcZ9mv<|O8lClBDAlTw}oSannx)B-SP|5
zfrg3v$qj|~mD3QLuavI)Oa0jJ<TF?CMjm0Dor;KB$sbRUp#+M&%UoBTOMS5#mXP&f
zE=4~CY>{+Xx(tkvNkQWbXS@urg9-Vn*>iA&(9MQY?Jvm%lQE>lB<;cDds?NaDJJO6
zfK1Ade=B@E6V0Z;H~G7{W%n;yQ1vHmjfq;??g827tpz&E-jr>YL)(X49K)nuE-8tn
Gh3UWT$6=@d

delta 661
zcmXAkT}V@57{|}YzJyvc+cc&2B589aNl-`>)X{BkYlKiyA<9gmbte>9kYwO!+IbJo
z13@==8Xo9aM+9%&g?OSV4np6(vx{Zj#W?Lk4upgS);ogdd47MMKRh23wPjBa7~cc(
zp5C#H9tx-dwhf_;5Msi}7e-xSSTl;|yK7SDo`5P{Xi=CorHg{p*=<S!%`1W_IYN><
zB>6(p{g5;qlE%_Ke)dj!sCi$Xdih6m@|zxqa|7wuownYv)R+E}czPVp{oRmSq08dt
z`PkP>iYU6FwuzJoIsml-dJ{n&xF#Ng;$e#Eh*%3Xg6bghRoMg;r+APWUZ|<49%|k6
zXw8lqp=p|QYKD`B1&u+E1i&nhJ`gk(1)x?zC*bxi2wI@h?#T|o(m)hjDZHa4sG;$w
ztvWgg^%n+>jG#OYxGY;HtX!A3*&D(jQR`8uNG))VfGJ|RwKcR-(3qq@(+teQc8=&N
z1Gx<SnGt6hjxY2>j)_fUuvo}&8Us{0$wk?BGUmFRI*F<HeNJxVXINEU=9}0Bd5gb&
za*DY0al^q)vXwBGoiIM-h~*S>B%m;^0OtR1#`Z)ab{@-Pw)S8L$zCHsAgZ?koF>`c
zsxBYFs}v3D(KbFfyEJOV6$cRHEnDlE5t4t2cNIQa4@447dTDL(rmz*KBL5lhRxyir
z-s+;^`4i7Dl;DYc*4}=sRQ&F@T&n+7sYss%TcqqO`@kTX5e&|XtoZOxFd{#<$Js&I
zwENww#T5Rn@GF&Up$PJ_*Kwh4lM34XwImr!qEQaTL1E#p!(`c;@>SQV{rypnVTvEt
JmHhh0xql?6FQ5Pb

diff --git a/Platform/Apple/tools/ProRWTS/prorwts2.s b/Platform/Apple/tools/ProRWTS/prorwts2.s
index c3182f73..7c6a5479 100755
--- a/Platform/Apple/tools/ProRWTS/prorwts2.s
+++ b/Platform/Apple/tools/ProRWTS/prorwts2.s
@@ -1706,6 +1706,25 @@ nodelay
                 pla
                 jmp     nodisk
 +
+                ; Drive is spinning. See if there's real disk data.
+                ldx     #0
+                ldy     #0
+--              jsr     readnib
+-               cmp     #$D5
+                beq     +
+                inx
+                bne     --
+                iny
+                bne     --
+                pla
+                pla
+                jmp     nodisk
++               jsr     readnib
+                cmp     #$AA
+                bne     -
+                jsr     readnib
+                cmp     #$96
+                bne     -
   } ;poll_drive = 1
                 rts