From 5a3dd927b8c550924a5e4c1c876d1c21cf5f067f Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Thu, 1 Apr 2021 22:58:15 -0400
Subject: [PATCH] Try again with the P24(...) arg data size fixed

---
 bin/driver7M5.bin | Bin 1677 -> 1719 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |  16 ++++++++--------
 rdisk.h           |   2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 047fe53e46dc843e2d53180b7f85e82a01942886..8528fafd68ba184e30e44e925812e8c4d3d23884 100755
GIT binary patch
delta 293
zcmeC>-Of9~+0oADJ~M+~smF7M1Bnc*3dlUh6ChrK5=4&q35ds&!NABMmBt6t!Ln^)
zi&DKlmr6bZk9-YKj@|J+1G|90f>?nD(HaI9215iNU0%V4fl+6@=pF_a4hDoOmH3E$
zztX;f#FFF;BNM&M;-W-70|o|$$bOIKG7M@Q8k|}TV3YWPdicRMP28_+rq8UV&mfSi
zf?)~JVS?)!L@bc3P?HB)(Hvl8vN?pYf|2R(y2<C5vKgx;TQScElDC*AF)4Fx&SQ~h
F0szGTPv-yt

delta 239
zcmdna+siw_*-^yjJ~M+~smF7M1BnbQ-;jBX^FX`=C5RmJE)b6=gMpDjDvb}Wqi14^
z(qtY+n|k>gpbWF)dj@6!fd#Pw4GQ@T918jjJc8>P1UMKF;t~CRrOg3GCJYSvT>8vv
zKo#;f3@$)ysL$;B)1g%^z;6;n<o|koX1_`P?->Nt<W=JRO8W{DOOi8;O!P8~ixTw=
y7#J8L`}Mi?xzs$pRx)hvX3S<}`sXqE2U9kq$mA5}`9P9|WfGIpgUvHo<e2~t<wGd|

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index a0ef7bac1fb8025ad37e2fb1356a0359ddc10159..53d340e7a479bfa295032439cd2b2fd8ca4feed2 100755
GIT binary patch
delta 811
zcmZY3y-!n79LDi;+a6nLr5B~XAZ>5kYm11zP%ENhv09-bR(uB)p`uts1c54Im7Cav
zO%j)mIy=Z9v5SL)ga3jt(Zz((#nr@bF$SW;CnryS=XaiCnx@UHC@Muu(OR@E%eUTS
zqUW1cWb)}1@gXauwmvDJDrqSAXJ-9gNv@nwMBPaB-woTl(oe4p&KpjBLb&_|ruO6y
zVOP~x1FGpMh?Hnq%m2=`cA+#adESeZL#*A>2m2N?`R9|_nc-Y49vz*Y%0`=o5dDkk
zm3k3&G*mT;)tB7txL2D>hEIlC4QtpC>bU-24PUES618pXO2Yn1$+O;Ay!_E8XBEq@
zH>HFo$CSC!YfZl7=nlvimXNdjH6Z<#g@`V(0d_c01t&Jbg-xi28!BqB8Cy^b54K_(
zwqpnCuoLz0!UsPz1Q0|BI(8w92pX^(jo5=G>_rp?n$dz7_92e_XvG1v;UEs-Fxqhh
z33T8nk~oIrNZ|xJ(S<Zlq8q2sgVV_140>@E=Wreua1obq8GY!-6<ozN4B$EjF@!8`
yU>G-X3nRFV97b^mW4McP+`|MWaUWBd#tia!fQOjHBh2A33V4F2<%mB2`O9zNdE9~k

delta 799
zcmYk#%TE(g6vy$~PDg90Flc=tZHHQ0Md(1S?;<UN7Q~@GP*4#nip45mX?<2{VvQSP
zlWw|Gx2`bJq=|9iAK=0T8>3NoF4-6pW8(O2NYusW-19r<-rRgXZ^>5`Oa*g6Dp+30
zFP%|G{})N<+1NMnHX$rO{!gYS)imZ=+DWgg$(|G@(J)c__r;^~cc<(r=Uj4l&Yfc^
zMHhvnD9=WeygDtcswV99^FpzTfAgWDp1mIrhJ?^;n&jh#J1n}<u1P&VBM)40y|gqj
z<~2z#4J-=9=k|{3*~c@9%y=>w3QW$X6M;4%#Bfoo(QLlnzUQLy%O$5w=HIb$Ql)W}
z7gYHvN2W<GnLS@CR*&p9H%E*&ttsI(7CKU*#rQ-YFg{aN<2|*}csE##O&KrJ!u`<i
zm9Y%VVZ{pAPy;(wq84>fP>)qu4F}d>E!JT@HlP6;(FiA8sQ#s*2_9^M7n|XOA6u{$
z&De$(v?2fvZD>aj+Y!PJ?8GkY#vbg&K7`SM{pdslQFP$|y3vD!ID{B_(TBt6#}Vil
zKpaPL499T-gE)y(7{V}4;|$JX1m`e{F(hyv<G6r}n7}0@F^S7a;R>!|3e%XuHKZ|%
a46?Y68@P#ExQ#o=;V$k~{NA|_AO8T=o8zYd

diff --git a/rdisk.c b/rdisk.c
index af6f1fe..17e3d19 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -53,19 +53,19 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Switch to 32-bit mode and patch
-void P24(Ptr romdisk, long index, char patch) {
-	//if (index < 0) { return; } // Don't patch if index < 0
+void P24(Ptr ramdisk, long index, char patch) {
+	if (index < 0) { return; } // Don't patch if index < 0
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	romdisk[index] = patch; // Patch byte
+	ramdisk[index] = patch; // Patch byte
 	SwapMMUMode(&mode);
 }
 
-typedef void (*RDiskPatch_t)(Ptr, char, char);
-static void patch24(Ptr romdisk, char dbgEN, char cdrEN) {
-	RDiskPatch_t fun = (RDiskPatch_t)P24;
-	/*if (!dbgEN)*/ { fun(romdisk, 0x00000031UL, 0x44); }
-	/*if (!cdrEN)*/ { fun(romdisk, 0x00012CAFUL, 0x44); }
+typedef void (*RDiskPatch_t)(Ptr, long, char);
+static void patch24(Ptr ramdisk, char dbgEN, char cdrEN) {
+	RDiskPatch_t fun = P24;
+	/*if (!dbgEN)*/ { fun(ramdisk, 0x00000031UL, 0x44); }
+	/*if (!cdrEN)*/ { fun(ramdisk, 0x00012CAFUL, 0x44); }
 }
 
 // Figure out the first available drive number >= 5
diff --git a/rdisk.h b/rdisk.h
index 5502ac2..b4f8301 100644
--- a/rdisk.h
+++ b/rdisk.h
@@ -33,7 +33,7 @@ typedef struct RDiskStorage_s {
 } RDiskStorage_t;
 
 typedef void (*RDiskCopy_t)(Ptr, Ptr, unsigned long);
-#define copy24(s, d, b) { RDiskCopy_t copy24 = (RDiskCopy_t)C24; copy24(s, d, b); }
+#define copy24(s, d, b) { RDiskCopy_t copy24 = C24; copy24(s, d, b); }
 
 #define PackBits_Repeat(count) (-1 * (count - 1))
 #define PackBits_Literal(count) (count - 1)