From 36797612148263b61e5fc2173cd82d9117e3483d Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Fri, 2 Apr 2021 02:50:54 -0400
Subject: [PATCH] ...

---
 bin/driver7M5.bin | Bin 1599 -> 1587 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |  11 +++++------
 rdisk.h           |   4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index b03ac94431737c0f31281a2afdbd2e0fd0006e5f..29218ab9b68e049aa506ce7c9273ca2d49490563 100755
GIT binary patch
delta 644
zcmYjNO=uHA7=5!pG1^7eB^W4@4%?VUvnJJxY4I?L5tAW=ic~!)M3J4UMM5zlNHD2w
zBzo~D;(6~L1X~2XboDGEqT;RKMe4<i$AZqL33_`!-}~mxw_&Uqk51-3ls8pW>ct=M
zFGIijKO=VnR<(CL^;N)(1rUt8dq)Xv`|)a(X4Hw6)W>qaFlL(GC9@M*`G*q|{V=&t
z%KazgY<t!zCQI}hBD^P{>`%;%rx0^N&P9U_F`2TLv>GY0Y2uxcY;s8-F*5_3XGwh#
zcw=SBEroz=`NwnlP(<ar3w++g5Z>}nlV~3CXaNWLbI|jC$uGTq*Aa|ojhC7L*82-e
zyggL{tu>2`wpb7F()kpW_zh70KqUBzYcvX{e&T55HS5Oa_^N9)3W57&8^n1rRCRG(
zrc@qs-P%TZ^J4SD!%962K!mLfCad_v4nPS(ks1+Jpaq><<Th!viL{+Oss3&T=-5;X
z9hn?dvIlsl*x;#%oVdb6!kTH}8SH5X8W_b4gT`e6ahIk*lP7|Y@QzTDpo=iS^=t>G
zv5Y1lPxkb18gZjLWcS*E`Kdd!8&(>-3<AZSwQtHB$V-VB)oH;?Q#ohL=*Q(l4Cav>
zl6fZUMCfjB-e$qfu;N#lSKaTjkm5SBMv{&;g{W>9s_QiD%~P3>_<e0{pO#ks0wVOI
ANB{r;

delta 626
zcmYjNO=}ZD7=C85+eBGpSrRQpH^Z`tF%4;ZN)Qi|#6z-#P?2I0loe!0YY(BA5+#td
zrX^ndAmVwC){9`h2twEV0_~wEq2NV(^5Rjbvo%$3^L)MYyzjQQqdlvXcI*2QG+Nbf
z2yQ`b{*TCdh+ONB78!*|y90tL@6_K!?0Mg{?OL)U`Dp0}qPp(i(0iJJ%O2f2{KpIx
z@|Y|RpOCBFVy2p|vAc*n0|9E<^OISa9>~o^IK`A1b46*ADxW3(6^W87>M_!1U^+$8
zS_Vc&k=&;Q<RB2GvKpUo6c6}vk|TBy6iA{BJ5fQ(c@1_gs0Fo;qn_YSQG2Th;KT4X
zwY#YrShHQ_tiuO@pD$-Y*%FxSm3KBh-Fm<`&b=yq$6Vt*-!SK$N8afpZYy+s{soeI
zGgcI_B-0T`^}OazegABG@oA$K10Z6?43aJmi&LN~sN{$+LXJ+#@()RybcmGgGI4*d
zhOcaDcqYQS*Bw<Dg$`cAnw^FM&QRb`9Qlh_XIZfHrLeWr6EqEW5BlD~nue~ep$*9U
zyvXEWYyC0W47J_<SY0)8h-w7XyJ#)TedSez$rM)c^Gy0InXG?WJI|qCC?QkkvQ?a&
t@E0r|nvPbEyL)m##QQ1>Q7<QJWZ3bj38q*T_Z^G*3rr@g$~INz=x;4qoi+df

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 7faafab6d0539e5e5a54948e7d456a864242de1b..a83ed6f6f6e133a2ebb822aa637e19beeabc8e45 100755
GIT binary patch
delta 1172
zcmYk&PjC};6u|Mfn`{U)VvLb$rOA&?Xafyt!9TPWWfOxWYmBW}Km`nlyZosbD~S;!
zNhQ_l#fxLFIXdH^Gun~Si_x>=IF33ToMFa`g9p8EWCp)m+R?*j=Dpwhz2Cll?RMMW
z_H?w4-tl$(E5?_D*&j>SeNwI!{*>NHF;4$K(=K~i#k^DVedT4LGos0Wvw6M4e{1RH
zpixnyzIc;LU-lpA3x~VM!|mvm|Kg$eQX^)3sFjxVxN)d8nJ%P?>a0ZVMOXAKLsJ7I
z5_3d5-0!^+qtBf4SG9sQrgf*u5_86S79JJT9@lEKBHu*DwTrqY+Kt}cY%UP>*@h$X
z%O*>LH+l!P{+uNH^RnIkT-1?Xu~+==`?hP@<DoD7uE@&LwYZUN4HrdK8wE=>twoV;
zCO0B_^1LYfBX`KY;)Lq?1Aocx^4HcvY|8F9k$T>%{(4Ka^zz!N;hv+*X9pao`fcg@
zvBuGl%eA10xWUM%Br0;-+A4ZLbj~z4;+=UzH?>Pzy`@o3=d{Yrh8OJ_Zc3ZZ)sf8A
z_|9OfpNewhlpSy*6HWP4%(1li#Zoe1iQi@b_dPWtDz(r15xec`DN(Z$zP4zlB^;WU
zh6p?RWM@W_p@p^V{gzk!d10+wk7Q&+NE6+eG%v6NR^`T&q4M2~;+{$CPxCu03Gd2E
zDrYfHRBi0en3i{EZN%T`_c?zsknW@zBc;|~3Mj+OS5{Q8JEQ0z{-Jtxew&feLsI%X
z*uMQ)`9!%^{$M#_Ab<@BVk0)84<X!z&A1z3+=B@2MHKg83;J<C9>4$|#8wO<hBy?q
z!9)T{Y{w9Wk-`q_#0b*Zg$zb9hTYhMhwv~S!K2uVaZF$mk6|Ak#}n8O3t8mwB=R_b
zr*IGj6k+3Ol<*9^Jw1ylOyfBm!t<EHVI09xynq++5{}_GPT*x!a1y8R3QpryIB;<W
rXK@baF^ku50k5NqH!z1caS=7t@fI3*8<+47ns^tNuP!HA)4%@<7$tTd

delta 1142
zcmYk&&vO%H7{KvoH@j`Xh-*x-R=RoFrX{4YKm65*sG9^eS!->@N=3ook6kELV{L1|
zXafeQCoYV+<|tk|qs%bQIAiQzpp3(b8D_jFCodcw@w-^m!)Ion=XsxJpZ9Gv8b%}3
z)S7xT(ljoa-}dLPOkR)3)N<)J=^PQW`u|8f9Yz)BpIT%ijABPclRkgjza7!m&3?0z
zN|lp!D&6@%q}#IEhpa{{F8h4_;;sKOttH$1LYr&-Wt;m~bLrAhSsjyvw-$(Qr>1)|
zV*8>U?g{7EblHnWRV%q;T6=~lxoF;rtWmMOoVL6mvJuZ|OS&f7jZTm+n29dW@I|g|
zbtQVEGokeqB-K-tLGNo(2Rh|W`Nxe$;Ci{(H%1`xee0K`nOYqzi>lU2uBy9hBJGhv
zMszhVip55}v%ck=aL@FAmH%DFr@nK~*wfzU{`T9si{YuC{}e5|zF9GXdAcK>>HF0m
zCa>?P&7GfGj*3VSjgLyQBDZpVqMM?V(}H-I(|g(eq*l}F8s$_$tK3`(zcPcZbIMe!
z2R$>0Pt@g0amI$l5Ld~BD~88!g3~G^YG`k`w$}*sAyLQ0y1M2JixoR1H4$FuLOLs{
zSaUNv8`iEgH>)f0taQgT(fvKn0vG080$UlX*d9@wbLgD>>C`S)tlfD@7hKj#s4eYT
z#|;nNzH_2-l>rg|R~FL!ENi6Iol#xNaEg^nD%ze^bU4M!i#yG6{oMM1i7s>_iY?fR
zyAZ?O*oJ#x;a<dX9}?)ncHEC%Jb*qth#lyMjU*Iy!odJi7{m~EA&uS0U>I3Egb|El
z4C8nhkKj=}hQ~319G<`)Jc+${3Qyx1xX7b`BKF}~Jcs8|LKz-jz$9M86kftKX7Doh
z;}y)}RUE(^Uc*7WjyG@!hw&yVID)tEHr~Oz@DboBj$t0hv4HpRK0ZJdA7T+7VF}Av
X!N;iK1Ww`;)bS}kySzTII&<xBC?ITa

diff --git a/rdisk.c b/rdisk.c
index 3c5b729..8bde1d1 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -53,12 +53,11 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Switch to 32-bit mode and patch
-#pragma parameter P24(__A0, __A1)
-void __attribute__ ((noinline)) P24(Ptr ptr, Ptr patch) {
+#pragma parameter P24(__A2, __D3)
+void __attribute__ ((noinline)) P24(Ptr ptr, char patch) {
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	if (*patch == 0x44) { Debugger(); }
-	//*ptr = *patch; // Patch byte
+	*ptr = patch; // Patch byte
 	SwapMMUMode(&mode);
 }
 
@@ -165,8 +164,8 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 
 	// Patch debug and CD-ROM enable bytes
 	if (c->ramdisk) {
-		if (!dbgEN /*&& *RDiskDBGDisPos >= 0*/) { patch24(c->ramdisk + 0x00000031UL, RDiskDBGDisByte); }
-		if (!cdrEN /*&& *RDiskCDRDisPos >= 0*/) { patch24(c->ramdisk + 0x00012CAFUL, RDiskCDRDisByte); }
+		if (!dbgEN /*&& *RDiskDBGDisPos >= 0*/) { patch24(c->ramdisk + 0x00000031UL, 0x44); }
+		if (!cdrEN /*&& *RDiskCDRDisPos >= 0*/) { patch24(c->ramdisk + 0x00012CAFUL, 0x44); }
 	}
 
 	// Unmount if not booting from ROM disk
diff --git a/rdisk.h b/rdisk.h
index 0812bda..7267cff 100644
--- a/rdisk.h
+++ b/rdisk.h
@@ -37,8 +37,8 @@ typedef struct RDiskStorage_s {
 typedef void (*RDiskCopy_t)(Ptr, Ptr, unsigned long);
 #define copy24(s, d, b) { RDiskCopy_t f = C24; f(s, d, b); }
 
-typedef void (*RDiskPatch_t)(Ptr, Ptr);
-#define patch24(d, s) { RDiskPatch_t f = P24; f(d, s); }
+typedef void (*RDiskPatch_t)(Ptr, char);
+#define patch24(a, d) { RDiskPatch_t f = P24; f(a, d); }
 
 #define PackBits_Repeat(count) (-1 * (count - 1))
 #define PackBits_Literal(count) (count - 1)