From a6a136e5cd04fd95ebc0561ce72d27b0ea95bbd1 Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Fri, 2 Apr 2021 01:09:07 -0400
Subject: [PATCH] Put dereferencing patch byte pointer in P24

---
 bin/driver7M5.bin | Bin 1511 -> 1507 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 caae6e1b026e7383eb84716ffc2e0a981210b035..743a23b08a6a0c4be7c33de93dbb1a63ebfc362b 100755
GIT binary patch
delta 254
zcmaFP{g`_~ps|q8eP#x~Qjg~h2ND?=J3zbyB?yoC8i>b}!NABMmBt5C!?I#xOS~Gl
zK9`Dznx}jXP?Fp6Jp;FZz=BwT29e1Kwo1I(WKPCjCZ#`<XD}vnYpDcCXfep8F)(IL
zW@FNoJ||?sSi;1}z$nA~gs*_{OoJ1v2%8s68Uw?V$$m`QjQb{6F*(ZXd9|epC{;SN
z%C2yH!C>gO)1g%^z^ge;3@o;C@;xSFO&uv_CRPR}4rT_%bRi*q26>RFRg4vkHH--i
a|7DyQ6TXyzSSpjPm=zf#Hpeh`GXVgMkwj1c

delta 234
zcmaFN{hWJ3ps|?GeP#x~Qjg~h2ND?=J3zbyB?yoC7Kq1_!NABMmBt5C!?I>#OS~GF
zKC_C47=wHbP?Fp6Jp;FZz=BwT29ah2TTNbNGACm%lQP5P8H~x?dMW`DS`2b&42*e`
z*_d>tF9}&NmM}3gFv>7L;VWP~)8ND^!sf-2#=!7mvLBN+<Dtn_OpeM%UTtYYN|g?+
zvMU4x9bYgQ`t5XRl?(7{PLogoiLMk7n0$-Lm{DUgAG0jCgcD=Jmoml#hW`qa&6pJ#
LLpDb+cQXM1!OK6m

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 3a06a7b5d8a1233e712088e5a3723f3544482807..d17ff5e565363b485766cc742e40299f44152bdf 100755
GIT binary patch
delta 778
zcmYMwJ8Y6+6vpxQ1>TCKA|lpGfsX>Br7c+TQtyB_iWTuny;P`GTI;Q9i>0C^k*bMt
za`;xq*4d<SX>@NKolIPsXk1)6n&|)27>8eSo^wvlaB8)hrDmwhx~XoiTi&V<-ng^x
zi&<nR(qF~<K_Q<TsTla1%%6<ZG$N#Mm+b#`EVKHuR~5pxSYs$1?$xS{ZOI?P=5V|o
zaMWC{{@0;GSg-ihOH<&dZq?L~EfUJLM1-#-<fvZOR9EXqXOA2=Ng+MvCHt6MtfiEz
zA!8{Cv7|3(szWa5-!+xgqM4^9N1&3J@y;f{iSF#X#EdVOc~WZr)0@+?eid);bel~|
zn5<?Yhn>!t(2T=Va#B`hQT+0xWO2D{R3ZJ1U$x2p`9;5aVX{PpJ^d^nRA|5oSg{g~
zu%QX7V8?1Wum(=7g$wJ@jP+>22Ds4*54`X}gCA`OAczn)B8*MgjCMrOflhQGiWs(_
z8(R^_Hf+ZZ>_iWCVK??*FZN+S4j_RfQaFf1IE*7W3gaKW$lw_Ia2#2jKn^Ey3a4=f
zXK@aB^y54(;36(z0GClf5repbAzZ~ZlrW4DT*oMG;3jV2Htt{ycX1E*F^&n8@c@&k
SU<waW#UnhP&j+XHKK}+4XX$_d

delta 754
zcmYMqJ4{ny6u|NC>+Od~v0iGe6=?6JtrbB)s1JO%^;Ij@s%U*7Mf8d<M1^V<;U*L{
zG0t~&GLkr&5Er9P4o;57#KlD7;=-=~#u$fRa{lKW+qT_yRYg`@6|Lfat=@+cfxd5=
z$W3H^h<8ImKB-nQ^0%}v)v6y6QZ!oLe?RV5&SFRn#_PJYSSBEhNzR_sFX7Sk=L5R!
zpZPz>jhIsot7opLaB2-T?CFf<gKZ*g2|4PN4As%}+1D$_T~f$q?YnnOezMcbUz2rP
zLM%9M4b?6`I6n=QiuPn5S-wa)IU9PZH>4IsckWGcHk{ASSV6P8ozrzEYpR57b*4-e
z@&wbexLA@!@!ND>n5sqg&wn)4Q`h4{RG|h-P>ZFgg9r6k1}~OFM+1CV0Y6qEfK>=$
zH5$=`W`q!i0TV5VAc`2)Ada<Y#X7X19qZA7PIO@dy3vCKHewStV+(q*72B{KJFpYG
zup3FFkj5VD#XjuE0c3CxSsX$i4kL#n$m1xE;W+wn0w+<xDV)X`oW(f|;5-IV#1JlE
y7#DE~7A|81S8x^Aa2+==ikle2E!@T(jAH^N+{HbVaUTybiHDe)FGQ#3zWxEnOXT(d

diff --git a/rdisk.c b/rdisk.c
index f2e86d0..784fe40 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, char);
-#pragma parameter P24(__A0, __D0)
-void __attribute__ ((noinline)) P24(Ptr ptr, char patch) {
+typedef void (*RDiskPatch_t)(Ptr, char*);
+#pragma parameter P24(__A0, __A1)
+void __attribute__ ((noinline)) P24(Ptr ptr, char *patch) {
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	*ptr = 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 /*&& *RDiskDBGDisPos >= 0*/) { fun(c->ramdisk + 0x00000031UL, *RDiskDBGDisByte); }
-		if (!cdrEN /*&& *RDiskCDRDisPos >= 0*/) { fun(c->ramdisk + 0x00012CAFUL, *RDiskCDRDisByte); }
+		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