From 4c75e2ffae5f0c39b547b751255f893152e0fc6f Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Fri, 2 Apr 2021 06:02:40 -0400
Subject: [PATCH] Simplify debug and CD-ROM disable settings initialization

---
 bin/driver7M5.bin | Bin 1895 -> 1877 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |   6 ++----
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index ab346a8ff70c6407563e32971cf47080a619a5a1..8aabf41a46bb66ac31e65fa7fb9e60dff2249e09 100755
GIT binary patch
delta 257
zcmaFPca?8KpmCeeeP#x~Qjg~h2ND?=AAooXN)R5)4G@nfgMpDjDvb}OhD~l`OEx28
z-sBIAiQE^|0;IGV<kA=z7fg;}(yix`v0yA=Vq;)@d7#{p%YlL8<pFa>Cl<$_4y|%c
zDm4zRvNQBO7}WeGs5>yIfcbM2@}YbUFn@(tdpeg&HiOF5KMoxX40<*|odF8&eiOtU
z7<3fe!D?1|HG|b?K-7TcbiGzHC`^`Op04~sf`N&Jfr*2Gfiazdu}wywK^x?v3dSnN
SI>s`_1crYPHeX?$%nSfX97)Fj

delta 245
zcmcc0_ndD+pz#c!`^*e}r5?{24kR)#J^=9&lps8oS0Elw1_L95R2m;l4V%HnmTX4G
zhRGio6S*I$1xRT#$fYqbZkim!q+2f|W5HO$#Kyq*@_@J_mjeUG%LC?&PAqyh4y|%c
zDm4zRvNQA@8PpWq{U)e8FsOh<=0JHGU{wKNu@xXOaR&w+FmEN4r>msTpq4JAlFguU
t^^Zdb0|QKzS2I{tg99c!`5)6l#(R?&FiUY1F_tkVF#J2W`4IDDW&n&BNmc*=

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 4f4565420bf9d86bf146c067a858343108dbceda..642a299fa960b77a54c6c3b449dae5f7626c6315 100755
GIT binary patch
delta 791
zcmXxeJ4{ni9LMo<+Iwp)h>8!e_HilKQY@t^DyXQph_qI$_5Ie?M~hae4+@9~jTSIY
zBo1|OFmaK%nslwZgNwn$K{mtY;9_Eo-xeJ{!#C%5l7Bv*SMn7FSuhpM1?9c^!Pzn0
z|II97xyW}>P71kDsf1^#lrNR49S~C3Q+5A07FX$~Q_V;@SWLLpWX&gU-0l~yl#s8B
zAKhwT(&p%rLne!mi{+7!%@Eeba;NN3LcfeD*Aso*m~y@hMuayu+hPd4+OM?izxGx8
zZFDAW(=$T<{M&dYM0+<s<61a2+hB+`EnMBqMW0qTzNJm|Ef9StwBmD3EjIsX6edNO
ztU}1NkkgK!@K;V6m1A;34$Fl2vry`7QeT+sO>g=*M~US;S)p)<b#7)}S7E_2Sg{;7
z)SwnCP=}RRh1ICX8mz@StVaVHu>p2$gab~v;D&}Kc+d<To8UzYd}zgH_|b*{+7ZMS
zY{fQoU^{kTCpyuEUD%C1=*C{`!+sbDp$7-hi-YJx7!e#o6o=7|BZ%QB;y8xmIDwNm
zh0{2Lvp9$IxPXhegv+>s1d_OlYq*XZNFj{@+{7(pa2t0ph%D~n9`54-hLFQBMlgzp
R7{eos<1r>m^ZI1#*S{}vEw}&x

delta 761
zcmXxaJ4{n?7>4ohPkU+wL`0=pd-qt1P>P^}igJn|h*<0W3bbAdT17>`8_J26=xE|l
z1{XJ7jY-$K8#lvXqQ=GG>}ZTnk97DA&zsjYO}kl=Q@M(qEoXnPeekv~41KdnVtU}G
z6w{)<mns$dU-n<6svZ|5?o3Vj<7h4X_G($B%zVnPrK^5~lkO(*WkkKpfAnk7Igh7P
zO;tEVEfrnyN<*AW#SYbDZ|O4TeNXgRW8S+Ei%U4rpLo$=h;A*fmMdbtlGgU7w7Cpv
zw(9M2MME(OkJaf}(Let&o{N-UgHNqB;w;bkiGcQ6ea+VfHMet8&8U?8{ZwcRYA<ci
z7Ih5{tbh|MQHd&4V-;$!8nsx1I;_PytVcau*no|2V-q~^!UsPB2qJ{d(6I$!G$4XT
zY(*2A5k(7PXvH?Pp&i??13S@yPVB;N>_HdyVjsF;AdVjFM=$zt0R0%iK@8#$hHw}O
z96=ICaSX?C0w-|_r*Q^naSrEk0mB%<C{jq{A}--Ft{{UkjN>Y<A&cv{feGBiE!@T=
c?qCYjn897#!+ku!L(Jk49v2q%xyCR50N}4D&j0`b

diff --git a/rdisk.c b/rdisk.c
index 4e5809f..9084f36 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -152,10 +152,8 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	// Set debug and CD-ROM disable stuff in storage struct
 	peek24L((long*)0x40851D98, c->dbgDisPos);
 	peek24L((long*)0x40851D9C, c->cdrDisPos);
-	peek24((char*)0x40851DA8, c->dbgDisByte);
-	peek24((char*)0x40851DA9, c->cdrDisByte);
-	if (dbgEN) { peek24(RDiskBuf + c->dbgDisPos, c->dbgDisByte); }
-	if (cdrEN) { peek24(RDiskBuf + c->cdrDisPos, c->cdrDisByte); }
+	peek24(dbgEN ? RDiskBuf + c->dbgDisPos : (char*)0x40851DA8, c->dbgDisByte);
+	peek24(cdrEN ? RDiskBuf + c->cdrDisPos : (char*)0x40851DA9, c->cdrDisByte);
 	
 	// If RAM disk enabled, try to allocate RAM disk buffer if not already
 	if (ramEN & !c->ramdisk) {