From 2cefcb06575cbe076545baffbe476386971fb83c Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Fri, 2 Apr 2021 01:01:32 -0400
Subject: [PATCH] change patch24 args

---
 bin/driver7M5.bin | Bin 1519 -> 1511 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |  12 ++++++------
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 74610c99f6e61e833fc85941e99929a6f1d9f787..caae6e1b026e7383eb84716ffc2e0a981210b035 100755
GIT binary patch
delta 300
zcmaFQ{hWJ(v*RV7`^*e}r5?{24kR+LiXrnDJ3zbyC5RmJEf9|<gMpDjDvb}OgJsRc
zmUwk8eP$I8F$Vb>pd`2Bdj@U+fd#Pw4I<45wwk<3{A2;fUPgw=^B9x4^;7~Rv>4>l
z7#Q;=^Dya3UlOulEMa0~V3c8g!dJj}roo9-gw2a3je+6C<Paup#zT`Em@KWc7!)@A
zVPHr%@@h*HQmS-lm0ckq==g%c&~K+ht6YFrbDD$#NOYxufC5nM#Xk&;I_n{FlfN-3
zGipqhVwTmFaAHjOQpT9T@Lxf-hM|FhfkC05!oxuc%vPvz=wM&~>k$E}2-%#%+|2|4
D&|Oto

delta 304
zcmaFP{hoV*v*Qh)`^*e}r5?{24kR+L$|3U@`#`(|C5RmJBM^@#gMpDjDvb}OgJsLa
zmUvxeHGKwwTow5mpd`EFdj@s^fd#Pw4GQ@TJc8>PL@XE(Vrue}xfpvHIVR6wOy)LF
z36RiYkV|7=ESSv3q$_<z$bzwiiIIU(hWQC!0ppnlCsq+QFP1b0hF6pQn6w#>Os-<G
zwAErzNVo86OOsHjbZC`bAur%j!C<J*;J4GERW88)Jp-3lbDD&_4TFom4FjXjdVQdJ
zgxutJOv;*SQp`-O3``u%42<bQLi!ByAUmrVD;R4S6Bz!BIWZ=DDFd<OCR;HpG6rpq
IVeV!E0PK%W)&Kwi

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 7780d1d08da9c4014284e15f05236d25f8daf1dd..3a06a7b5d8a1233e712088e5a3723f3544482807 100755
GIT binary patch
delta 828
zcmYk&Nla5w6vpv;X)hwh`oM}6Xy3CfgN%X`h(lYaTCt+yEVhU~5EW4YL94!mqD15R
zZFQ#!i6)v5T@mBbjl`8PabqGoU9cp<e<4N}zvO)PJ7;q(%W_&-8JWq+I5N(+>Wwcl
z)ArpV5<{_{V!BJH;{TJJ$fi_asdIeIrh;A}MTzPDd*Ph4=X@$zncv_D#fpWVrglYs
z374il>(ngI*uS|#4<&8OubxU_yLHv=st>h$tA*bbvfobYs;+dVs96r?NFmD{KimWI
zlND8-+_=*eV%Gkss~Y*i{;jK));?jpo)@C0DgMwb3XF!weJ`}a$gF5gybF)}+v8)V
z*T}xU)HH+L&+|gozFO*R(@;TKWj{8Qug)8lskvd95(`FoT3A8|V_+l}4lK?_Iy@o7
z;+2Puj;Sw(dXkej-5?V07bfG6l0k)BEJGfaBOfjlU<KS*2@QoP!YX*M8pT)xFV><2
zr6_|Be&{f;4gmxaLOCi>i7Ko|HEK|cI@F^98_<X*Y{VvP#ujWvGg`0>t=Nto*oj>T
zBZ4S)V-NOXANC`L1IYf%LA2oz5;%-@9Klf>LkEuI1Ww`<PU8&D;v7109!aFog$wA$
xMO=c39`xce`fvqTaSi>rjse`jP29pDhA@oV7{Ms+;4ad*hx=2>;DhJi{s6q80muLV

delta 823
zcmYk#J4};d6vpxM_Uj835KBd@K>K~rTIEs;UW<ZKM8%2)@qU38(SjEQ6|f*`6N?T;
z*KgI$xG+dUT#SPwql1Hqi7_!@VPV&QV+;<z<UHp&Z{BP+>&)imRL+qza?S<)-WU7Y
z{oRnnWY;hGG$`8te^RgVDOLNoGk)Y#$%rVaOqc$9;asp+eL5L7LJ@I~2F+RO!q|!w
zy4|n)-C1i)O3LP?JSuCukZI5O^-JZlU8Wu?ZVL8#>&2fIHEvItI$ZU|6IBxqC92x^
zSvszkvK_j-Anr_yEZZMV-Jm|(%cgE=s~2lH8h@7dTGQ=wzPF~kD<jPjNqlIZ^Y`|w
zNKyQ0+H1B-XQWkB<9vksway-}bf7L&X*jevT!yG&k0&B#{@WRqQL`!~zbiUaYIQ0<
z`R#X>u2Fr9OO}4&c%BSs6rd0;tV0osQG)d-#Rj-h1`jr(9Gg&q&G2FiDp7@M_~3^L
z3pJ=k06}a;2-~n7b*M)J8WF}0M9_q0?8GkY#vbg&K19)i{WySDwBaBQp&c=F;4nII
z1V?cUT{w<7PM{knkw6c6aSDAnjWallb2yI+xQI)*j4SBJ0Fp>y5LYpTYq*XyhB1O0
pxQSc1jZxge7{+lI_i!H*n8XwwAcJYl;2~!52#*(&fhTXi{Q*hx_d);w

diff --git a/rdisk.c b/rdisk.c
index f75a763..f2e86d0 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -53,12 +53,12 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Switch to 32-bit mode and patch
-typedef void (*RDiskPatch_t)(Ptr, long, char);
-void __attribute__ ((noinline)) P24(Ptr ramdisk, long index, char patch) {
-	if (index < 0) { return; } // Don't patch if index < 0
+typedef void (*RDiskPatch_t)(Ptr, char);
+#pragma parameter P24(__A0, __D0)
+void __attribute__ ((noinline)) P24(Ptr ptr, char patch) {
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	ramdisk[index] = patch; // Patch byte
+	*ptr = patch; // Patch byte
 	SwapMMUMode(&mode);
 }
 
@@ -166,8 +166,8 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	// Patch debug and CD-ROM enable bytes
 	if (c->ramdisk) {
 		RDiskPatch_t fun = P24;
-		if (!dbgEN) { fun(c->ramdisk, 0x00000031UL, *RDiskDBGDisByte); }
-		if (!cdrEN) { fun(c->ramdisk, 0x00012CAFUL, 0x44); }
+		if (!dbgEN /*&& *RDiskDBGDisPos >= 0*/) { fun(c->ramdisk + 0x00000031UL, *RDiskDBGDisByte); }
+		if (!cdrEN /*&& *RDiskCDRDisPos >= 0*/) { fun(c->ramdisk + 0x00012CAFUL, *RDiskCDRDisByte); }
 	}
 
 	// Unmount if not booting from ROM disk