From 8f8dbc83d5bbee120e97aee001078f9116931784 Mon Sep 17 00:00:00 2001 From: Zane Kaminski Date: Thu, 1 Apr 2021 21:22:55 -0400 Subject: [PATCH] Just make the patch explicit --- bin/driver7M5.bin | Bin 1725 -> 1659 bytes bin/rom8M.bin | Bin 8388608 -> 8388608 bytes rdisk.c | 13 ++++++------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin index 62d39c82b773799630c74d0b61189eabcd28d4e5..9969f77297b591e9262057c213dd51d51ca9fbc0 100755 GIT binary patch delta 481 zcmYk2KWGzS7{;IXzPoTklruC?LcRM8ZIL6GR2*)+o;Q3wLO3V0C=n&smQq7763anP zVxdm0ba9Z9QN%&aLrAG18W3N-nE`v~LUOaDXym)rEWW`cti-%x_(Z6FP{2}y9F?=li)9O35 zPA|NEW3NtcH%;fNm|x;6n0j{%L{Lhz;fxKl30lpk$4pr?+iHu1TcQ3fNmg4sqrjog z8t^6O&?ALFg)&SW*ibHN+%)1r7PMxT=?44mwHS=q0|lr0*?#jnRF+W>b+|Gu3`02PDbeS0u^ zFwdXQErGYX!sW3mGyQ9x4aH)XTDHM!AKWc740nP|)b{KeSfDl6Tc4^2Gu`wthFqXS zenQWcVKs14DnKq$q()IL)zY0C6jO_&Tk)vz+tV6Hk5lsZ1iQkzfi_rU6;g_m!MtY? zR4wSnRILF4kgnR-uT=R##OaT;IkHG>^eJ_20Y}0a%f9Vq<@kP zFeE%+UvwDa4AC;=TYOmFid)d*bI3ZcppC}(eZIFJdX8f%Z^THqvr4C0dVhFR(;jE% zq4}HK(wf#IpjWW-phg~=`~KI=V%w3tKq$;%^;`bOg~M~H=!L2XD2o?(a?C)oir=LK zL|`g3;+>AP=!`pLllVlqrcJBgZC3pjMC4?f2!W2m&a!(B>*raK(DQ2lij<*$0J`Lm Avj6}9 diff --git a/bin/rom8M.bin b/bin/rom8M.bin index cd405d53bde360432234529fb5cb9f3a61a2a397..583aab844976169124fc62751a041c6a336c2032 100755 GIT binary patch delta 1063 zcmYk&TWnKx9KiA4zo(~GnX?QgIJVP6?dGWMT98W-hFvLob{w_bWM05>Yk|Qig~1qw z9oZJ}X}paGV)kf^4+Ko6#)Kj-WHE$fdvlS*n3(utVt6DueoqMM!{?v#yPf3sa~#L- zc*fPZZ(JMqf2-ea%gV#P$C~7atUsiFK>WY|KT`c(RE#{UXwD{#W7Ts`Hn3dm0G0V*QZzBj%$cKJ(@mQ0TVvM!+*or?qRm^S-Tqq4 zXM@(~*1eyca=}hF+-Bs zO1LO)yhYf^M^2TSyqve^h^ncIqMFL8;*+di{QI02<)*$f^_AMNt7_#JKsGZad(05F85bn(|yF->i)cE(i(JcRVA$Q zKgjHstBI(N0A4^4FXAOELIYk#BVIuWi_wH7Sc+!6ie*@i*U*9$Xhjp(v@(*S2E++s0 delta 1053 zcmYk&OH5Q(9LMqheaVQU9dsDR$IM*uLXip=k=E%;hY{=LiX&F7_#S-BfLa+xMzNjB z#bVTrxPvq*{x`QB^9C2jvx&se7PYjOM4XtKen?=<@*e8<07RLkm)HcC7v%Asn1v^Zl#ih4nDQZ35lHd0N|c%R&)QaT~> zIGj`lRaKOTEfG}{Jty+q^oN{qukD(4JZHMYOY5#*|1)5VCXu|z6HeH?gCjG}h%?hM zQk@d3x?Sqr+hWePITxJAPrSVACWCirnHc{&VZ?^5doxE&^GaQ(n1vxHWtLNyMJAim zjiTC(VrCw`Yv>ts^?Z?v=4!c?rve#A)(pny{-;xq

!5YFKz{ERYw!TG5sYxu8!{sV!*A}as@ diff --git a/rdisk.c b/rdisk.c index 076e5ab..7445554 100644 --- a/rdisk.c +++ b/rdisk.c @@ -57,21 +57,20 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) { } // Switch to 32-bit mode and patch -void P24(Ptr dbg, Ptr cdrom, char dbgByte, char cdromByte) { +void P24(Ptr romdisk, char dbgByte, char cdromByte) { signed char mode = true32b; SwapMMUMode(&mode); // Patch debug and CD-ROM disable bytes - if (dbg) { *dbg = 0x44; } + romdisk[0x31] = 0x44; + //if (dbg) { *dbg = 0x44; } //if (cdrom) { *cdrom = 0x44; } SwapMMUMode(&mode); } -typedef void (*RDiskPatch_t)(Ptr, Ptr, char, char); -static void patch24(Ptr buf, char dbgEN, char cdromEN) { +typedef void (*RDiskPatch_t)(Ptr, char, char); +static void patch24(Ptr romdisk, char dbgEN, char cdromEN) { RDiskPatch_t fun = (RDiskPatch_t)P24; - fun(/*dbgEN ?*/ buf + *RDiskDBGDisPos /*: (Ptr)0*/, - /*cdromEN ?*/ buf + *RDiskCDROMDisPos /*: (Ptr)0*/, - *RDiskDBGDisByte, *RDiskCDROMDisPos); + fun(romdisk, dbgEN, cdromEN); } // Figure out the first available drive number >= 5