From ab16e98a10739d7061229e3b1087d84c2cbe4fab Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Thu, 1 Apr 2021 20:49:27 -0400
Subject: [PATCH] ...

---
 bin/driver7M5.bin | Bin 1801 -> 1867 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |  16 +++++++++++-----
 rdisk.h           |   2 --
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 651bd305ad4fe1289e89eec30199dea74da50684..155c930adb27096526e9112b9a132db236246c23 100755
GIT binary patch
delta 523
zcmYjNziSgw9RIv~7r2@bu5!5^#U^JtL&?x9CCCj9>Cxf&C}*7PVw<SsT9D>A8&N1W
zRXe!YN|p>#I*JGtQv_X1N;g3${s9FS$AY*BMSU;9AKT|A-_Ltb(jU{?zE28s#}q+>
zeMPs5#Qy(`^jT$m;L%g*rItW2T1)?J@Mn(~*4?CgCSQl{)M4b-L?StJf~2nRUe}v%
zPk~T1_h9Y!k+Fx-f3CBbU!30x8js4;MZm5@9lu}N9D8mL=g>zla>Fdr2Dp86<Z8jY
z(q^`N<pimq@ieNg-dvg<Do!rniK~-SXxZe|y5&u<{AGI?#%p;IisO{60<txb8yUGS
zEAE@I8WC2SBD+@w8;KKt823oyHgI5gWK~f>Oc$m?q1J#ew%pd{+t<3R$-1*mU*%H&
zq`9ClL*P&(TrpondTfLBW;Ze=IGGt-;4fhhYV099IBbTTd#N{~(r&FOV+p6zyJfd_
z6m!8Xzz*L3oS5I@Y8d+kP)=(r(TBO?bC&!mUF^{y-lZ8XMk@GKG$HmWLL=c>smaxM
l$vqMg;d;JO`R>!ow^%aXvgmpGfYZ(;`h$?2&c(!M@*A)ckTw7S

delta 498
zcmYk2F=!J}9LB%@y<E5<gfkeC(B3^mTjVHS5Qm%Odd=|qDB+wGu@bS|X%HJiBT<4q
ziG_A*OBV-`td<U9CS6SJreob(Tm%<ET!cb>*P?ZMzwiHjkN@}ooL|ka2LTRd_Zez!
z@eRW}&|Ci#HBzdVPiE|WO1XO=l%o8<gt77b_Eo#9R5tYk%ryIRW+GkWqjUVRzdZVq
zn|uLAIeouAvti)Wbz`m8?uD1HY&K|n$?`6Wi5Y$$XWtwGF|^6CaKwQXff~j1drJka
zR;Ee9uTcM*BD<ykCFxQ70r08d(V|A6k_$`Ik%@rs$7{Th>(_@O5yNT{WY0rp)#Que
zg29SajxQbWs!Y40Cw8m7VijY>X^hJ)@ROi;CU!n1aVWjqTNQa#=~Aw2mZ$a(k5&Ng
zk@0mUn*bRMhIgI8&in*l9iIVjc7)HnzVh@h1r9Wu*%{XXuf6k^tuS1Z*|-%rH8811
z51Sum_eVPEVNBJ)fVzZHaADVRG+Babq$!Q!LaL=bpHP>Yq^6aC>c0ZL{_{~v)y<pi
S0_#Y9@Ra=~x;5zNd-Mm?Er;X)

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 3667c1ebb4d01204f911a4a6b40e31a5fbf9fb34..88e87c211bc4db3ab1d9dca6279ecf4aa807e389 100755
GIT binary patch
delta 1045
zcmYk&OH5OF6vy%N@9iC{AQmm9GPb?q6|pK85w)Z9C>=(xcd+6cUr>Cs;EP(Rj~Pem
zh|$&Pt}G_Tl`+OdqhyF~1ml{-xO8FS#*K;5xG^#6_d-Tpe3Jh;=YR75-CHacy+zlc
z8uScmgWh5NZaAr8ZO=7H73`NX+AaF<x0RZx(zTN_?Snfj?-3<6nTjtPPU&4(?;Nno
ztZ8+9;y3#w5Iw`4vX<9U=J#LQ<1haAK_u%9-j>kt#3^uFYQ9d*uDY&{%c;Wo_NHbL
zqfflGrxO>#{~DE1nK<2uR@yn=<ay}H6U&#npSTcd-|$+>Q-yzW-TnJ|nx-~4^d8T5
zH#AD=N<_ak5Q^8^b?b~?3EXj?6pv}Phhh@Rh}v7_#)}XjnD^$CooH0oHd0mR_5Uj;
zt_p`m9tGm6-{TP#v?S=!#G4U$VYuOjoGaT$?V>%}T1<K!w?FQ)M3Z1v<S{oa@^fX(
zK4*`$o~ufTS=A!*ott7zuGxRvj~*AZjuS7x%gRvcRa6h_=Do4~MybNkgPm4PjMRgV
z^&OWTZ#JKdiRNgTqq&D|&*y~PpXDc!Pxvxlz>?~;d}<B~2|e^wcBb2NbDvPBR8BFC
zCq3zRNiF?0?^aIflA+Jl&N|x2Ekl2=)YXyewfa+4dUIsitc&BOj_)u9K1{_ll%X8c
zQGproqY^XW?gmhWAgU3<Y}DX;%t06tL}6eqYB3Kc=A#Y^P>+R(VG$N%2^wIb5lhj8
zWoX87tiVdd@dH+2HGafT_!++-ffgk3D_Zdz)?h7ctb>E!(T4R%VFTK+5u30XTd)<|
zupJ%Pft}ce-PnUpbRmsy?8QFp#{p!JMGty$5QlIWM{pE<$l)0BIF5c4Z~`ZB3a9Z0
Q{=^ylg|j2$=0MZ4&$3%^n*aa+

delta 1045
zcmYk&O>hip7{Kx8ot_@EWMdNIBa-emCc%hIHY{UzF&VRTT8#0vJ{B1tJ44tQBe7v;
zH@%gpjg#He>_MsA6y=~oRf+?_&B28e2g-$Vph~%{QWgKE);j#E-sh|PeO}jf{jO(F
z4f+PPLH|{Kq&_K6Iv#71?zNxE*dEb~pGT_8i?ZR5HSM|=RU8l{wYkbq6T$MEdVTi_
zvqWBNdnH;ZG`uV1Ix(rtO|woUPSu~aLe>!phQ0HJs=tHsf7iA%>E3}%>*Df5L%-B-
z#OK+K?bbn=dikA5UVKfFOkGrroT#oE@B0RmM$unTcA`ZMZy+*@`hSrVSG|Wt?pDWD
zk57rJjfvsY#h(*-@!=l-IDc&&vt4^E<t76&#0gM&5R8c?MxHsV|HEZzx?>O6cTxj2
zDT&mqk_P9ZSRV)NKkQq#-F(K0SBx-nuBD_Z!l7{6{deO-B34`lpAH3F5x-m++ZVlZ
zYk#A4x}jaHLZ6+mN(p*~o0C!TnVRX3Ma4>AOPn$?nKMoxUra{RqB(l5yKuAPab2JH
zG9fky3NI0?j)|F-@upf~BOf`Hul91@o+njF6%^H$q{_ZY>e<)Fy(m?_Yw5GKK1UyY
zY3ctewR7}&Sii4SvE03ExjDr=Z!{03-;TcscUqmpCZ{Lm8$C<If8LAe2w(z&_yQ9#
z2^IJfm6(hWs!)w7n2H)q!*tBROw?i)>QD~@CM?W`_un~)paG4Ti+PxjC>Edz3(<@i
zTJRNGu?UOtHI`s0;#h`n@GZW>a;(5gB+!N=Rw0G&u^MY&qa6;`q66!Y#(HG10UNOi
zo3RByU@Nv^J9gkl?8GkYMklh^gT2^?{rCwv<Z%E8(S<`ejGxhsBPie~ia3TI^x`;v
WK_5=wBz{E+zv1`Mdy)RuNACeCUvty|

diff --git a/rdisk.c b/rdisk.c
index 18e564d..c16634b 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -57,17 +57,23 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Switch to 32-bit mode and patch
-void P24(Ptr ramdisk, char dbgEN, char cdromEN) {
+void P24(Ptr dbg, Ptr cdrom, char dbgByte, char cdromByte) {
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	register Ptr dbg __asm__("%a1") = &ramdisk[*RDiskDBGDisPos];
-	register Ptr cdrom __asm__("%a2") = &ramdisk[*RDiskCDROMDisPos];
 	// Patch debug and CD-ROM disable bytes
-	//if (!dbgEN) { *dbg = *RDiskDBGDisByte; }
-	if (!cdromEN) { *cdrom = *RDiskCDROMDisByte; }
+	if (dbg) { *dbg = dbgByte; }
+	if (cdrom) { *cdrom = cdromByte; }
 	SwapMMUMode(&mode);
 }
 
+typedef void (*RDiskPatch_t)(Ptr, Ptr, char, char);
+static void patch24(Ptr buf, char dbgEN, char cdromEN) {
+	RDiskPatch_t fun = (RDiskPatch_t)P24;
+	fun(/*dbgEN ?*/ buf + *RDiskDBGDisPos /*: (Ptr)0*/, 
+		/*cdromEN ?*/ buf + *RDiskCDROMDisPos /*: (Ptr)0*/,
+		*RDiskDBGDisByte, *RDiskCDROMDisPos);
+}
+
 // Figure out the first available drive number >= 5
 static int RDFindDrvNum() {
 	DrvQElPtr dq;
diff --git a/rdisk.h b/rdisk.h
index efd6492..abf3a86 100644
--- a/rdisk.h
+++ b/rdisk.h
@@ -34,8 +34,6 @@ typedef struct RDiskStorage_s {
 
 typedef void (*RDiskCopy_t)(Ptr, Ptr, unsigned long);
 #define copy24(s, d, b) { RDiskCopy_t copy24 = (RDiskCopy_t)C24; copy24(s, d, b); }
-typedef void (*RDiskPatch_t)(Ptr, char, char);
-#define patch24(s, d, b) { RDiskPatch_t patch24 = (RDiskPatch_t)P24; patch24(s, d, b); }
 
 #define PackBits_Repeat(count) (-1 * (count - 1))
 #define PackBits_Literal(count) (count - 1)