From a62d310c6ff500dd366b2f9c8b0dc96ff723fb4f Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Thu, 1 Apr 2021 22:05:21 -0400
Subject: [PATCH] Make CD and debug patches explicit

---
 bin/driver7M5.bin | Bin 1659 -> 1681 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 entry.s           |  12 ++++++------
 rdisk.c           |  37 ++++++++++++++++---------------------
 rdisk.h           |   6 +++---
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 9969f77297b591e9262057c213dd51d51ca9fbc0..f75c51c0bcc73692981528709da8ebfc46a491bd 100755
GIT binary patch
delta 465
zcmey(Gm&?KlM|zm&wXYFzfzCq3<nY!Sbib%80Ua^2}%$-=6xU@PX+@cgH#$HT*rio
zElO-&`V2hjDia@RaJ3gCmLz8wnJ_R+Tw<rE&#b1;AdssfUjx*|?)aX8T|i(#tU!Z8
zJ_C>7dIk{-285WJ{A4!9BRq`%R01Tl8069z80{usV^j(f(`S(LvS2LDVPIGyV!>F#
z#KgcT!2E=xi19$96Ppx+7fTug!>(uCT+9rN1&qfUL|qwFM4cH_y;d<Ogdgx|@HpVn
z<Z<XoL%N@r1<$5*28Jn<vzTOAH8vkiQJLJsBw5d@uf?F?x9jhffPOEQ^b99024*j|
zw3LGVKKErRBKrMGIhYw3(m6!*8RQcf{)fphGqEu+0mT^8g+O8;_tY>}0PP0Kx;Zf=
zd?^F5{8Vcg8W<QD6bdRl9F)Lpg&Kzr1_r;K4y|&22~A#X=|bi;4AVpylnk^PSQs1>
z7|b0QSiFGNr?*UYV=fdFQ{Y?>s^p-+qTmeCH2DOxG4G{<a|sOp&J<h$lE)@<umm$c
K*&M?n&jbJ_hJMKa

delta 434
zcmYjMPbfoi9RK{@pEY{ZEQ&SH>-m#LZRKDGhv#jF*DtM=#KGYy?Mc$e#9En9Zmd^Q
zBuB|XoVa+ia&Xwi&NwLLC^s^{N6F>e_w%ps=UeoBNISZY%J3tPWY&0rGYR4OKO*BU
zGSy#=KX#Ec4T500;V+RZZm7kl!QyF;og|LL^>wB~VaREa89T_St29Qkv%p;-Miw~&
z5{y9RL<ni%RawzC+xF<rm}3+SCsEKnEubEzRJ{@KkS&(`@f<Ku*;qHqiS_0LI-BF@
zq9;&(bH<ucx+z#G8k5dh;xL*glImB7?muf=u=hE?7``Y?b=zlL>!c6~LrGq0n{q0(
zO+D6v9tKav^jzk8_%XCRzMahaSwSxV%NvNG-9)V~2v(S59I*l}=f066d6FSajq1dF
z*G2Pf$wdiU;oCZz*tSeXD=?79F4Sl*1ZWBdGzgU4vrx;~6a0K*y;65Hs%na$#D6+9
c*$;fb?>190@#SQyY+l*2FhVL93qm{h4Y9*~e*gdg

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 583aab844976169124fc62751a041c6a336c2032..3a20d54fcc3e8dae0ccde990a63d5bd75dfd22f6 100755
GIT binary patch
delta 988
zcmYk$Jxmi}7zgm@?cJ3E1xqamNPE|MAQq(vDD?|V5v(Ux1o`j-ErPwOAO$H_t#XnY
z+;A}7;=thKVuD5@gH}VBh=XC$fraSk!ekWuR}yvjy?Or6lPAxsX&SGkC0Wvt<dXa=
zVaD!f)|O?Cg0a9iO7#-|<Nw5-rc=nZG2`B*lQ}|+io>~oHy-J$cEM#-JY-g7z0Dz%
zXH7<XNBbhxwM4qjA=FoTxH1n}24yjU-He9slwq+<_gFM(h|GB}$mXSgy)scBa|rWh
zwkEe0y2%kHR<AdUf~&2-Lk`8uVgp3aY+g2MFc7nFE2a^ay6-m@lfs9I=DucUam1o*
zLCbF<IlqxgmFFaNr2<+Y6_^NonAg;x;x*5xM342)qF@)wU%u~`^`D|pG%k4DBn9Vw
zEwxT5yc+SliBpW>{^+}w<&t>!R4``Zh*Xo!Lt=>5J4-l&kqqcD)tc_5f0STxT*tK8
zZwRf9rK@0Rf;1wMqVa&w^{18+zK2A?H@*jsU}!=ys@A#$J+YCis)Bg(NmS<}Ucq@a
zslS$l;k*JVbGpOjlX$6dV@vlsg_@jC(T^coTZ}H@UC`rBp`ESFE;<F#Fv(;AjF15)
z$b>A&1~cS9E^Gn|<bf47gAMYb0JcCO6hSd;g%YrX14NL(2`<<MGL%9YY=?5#0dA;(
zov;fk!2?yW8>*oOYGDuTg*x!UKG+Wj;2<1=dN>R|XaGMn!VzeKW;hA~I0gzFhZZ;i
zK{yGma0=R>9Zo|BbV3(&!x=aW=iof_zy-JnA?Srm&<Fi+8N#4K1g^kUxCR3-2-jf<
hqA(02a05mm24ip&;&2OY!yQP#UAQ;P<ni?{zX9zC`dk12

delta 981
zcmYk%TWrfw9KiA4X?toYw%UeSyZ^e*rAFtvxp!Sre^YfCbMIVQcXb&vWo2842iuds
z2N93raU=^7$`X-9_QIP7iAW?K#iOWiNyNkF<os?qzmv^o9od3j)obgu_d1^FK~Gpl
zTRzz())D<Gxpr}U`9D%^g(%_sTeCkbM6M&Eq#`---$a-7!=rsx+^bhum0mr|dg0YM
zm#xkpuMCJcDe9PYt4jO2%|_L6LS)3<sLtDzsEVL?ZCV^jk#EMOP@m_nIj|!a%|>&P
zY}h$fOed8OMM1HPH^tnao_q8RM|+~fk)E=M_{*B5)_f$!-?`|u=&RS+RNQQI4Ki`R
zKBHW|VqeqypZS|&jW=|$4m^H!Xoh7NdRn_97!V`&G}Pyf$NNoZ>TEb5c2g%$rC+vu
zs_bm*k98EYVv&fXirhh|N=Ux0LRi^GPNm$1T;U^KDx=bhYJFHGeuQ=6`-MUju?7t7
zsVU{!Y3h`_AtQIhS3gG_5;CMABo31YQ<Cqp-WmE#$v9)|gH~V2a2U;hwkow^)q3HC
zH|f!Y{K}<2a6YqcSL>~6bm()nuCkTCO*+%Lgvj-k8BzI>w9F0VpU=Ia{2ES-K@rAc
z9LB?i37CjUC`Jj~n2b`Cp&U~%71L0G>8OMUUR1$AHGHUnAGMf)nV5yy2w)ECP}p%E
zf~d!QEWko6!eT5z0~)au%di|PuoA1V8X+_xjAlfz25YenQLKlF4QRne#IOl*Y{nLB
z#Wu8JJ9eNAJFyG9u?Ksx5BrfoI}YF=4&gA8NZ|;M;uwzO1Ww`<P9u#oIE!;Qj}BbG
VMRej4x^Nj8T*1{L<?qga{0+7t09*h7

diff --git a/entry.s b/entry.s
index 468bbd8..ea864cf 100644
--- a/entry.s
+++ b/entry.s
@@ -8,9 +8,9 @@
 .GLOBAL RDiskDBGNamePos
 .GLOBAL RDiskDBGDisPos
 .GLOBAL RDiskDBGDisByte
-.GLOBAL RDiskCDROMNamePos
-.GLOBAL RDiskCDROMDisPos
-.GLOBAL RDiskCDROMDisByte
+.GLOBAL RDiskCDRNamePos
+.GLOBAL RDiskCDRDisPos
+.GLOBAL RDiskCDRDisByte
 
 dc.l	0x00000000, 0x00000000, 0x00000000, 0x00000000
 dc.l	0x00000000, 0x00000000, 0x00000000, 0x00000000
@@ -20,15 +20,15 @@ RDiskSig:
 .align 4
 RDiskDBGDisPos:
 dc.l 0x00000031
-RDiskCDROMDisPos:
+RDiskCDRDisPos:
 dc.l 0x00012CAF
 RDiskDBGNameAddr:
 dc.l 0x4088002A
-RDiskCDROMNameAddr:
+RDiskCDRNameAddr:
 dc.l 0x40892C96
 RDiskDBGDisByte:
 dc.b 0x44
-RDiskCDROMDisByte:
+RDiskCDRDisByte:
 dc.b 0x44
 RDiskRAMRequired:
 .ascii	"16"
diff --git a/rdisk.c b/rdisk.c
index 7445554..e994c9e 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -9,7 +9,7 @@
 #include "rdisk.h"
 
 // Decode keyboard/PRAM settings
-static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, Ptr cdromEN) {
+static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, Ptr cdrEN) {
 	// Read PRAM
 	char legacy_startup, legacy_ram;
 	RDiskReadXPRAM(1, 4, &legacy_startup);
@@ -36,15 +36,11 @@ static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, P
 		}
 	}
 
-	// MacsBug enabled if bit 2 == 1 or DBGDis addr invalid or not boot
-	*dbgEN = *unmountEN ||
-		(legacy_startup & 0x04) || 
-		(*RDiskDBGDisPos == 0);
+	// MacsBug enabled if bit 2 == 1 or not boot
+	*dbgEN = *unmountEN || (legacy_startup & 0x04);
 
-	// CDROM enabled if bit 3 == 0 or CDROMDis addr invalid or not boot
-	*cdromEN = *unmountEN ||
-		!(legacy_startup & 0x08) || 
-		(*RDiskCDROMDisPos == 0);
+	// CD-ROM enabled if bit 3 == 0 or not boot
+	*cdrEN = *unmountEN || !(legacy_startup & 0x08);
 }
 
 // Switch to 32-bit mode and copy
@@ -57,20 +53,19 @@ void C24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Switch to 32-bit mode and patch
-void P24(Ptr romdisk, char dbgByte, char cdromByte) {
+void P24(Ptr romdisk, int32_t index, char patch) {
+	if (index < 0) { return; } // Don't patch if index < 0
 	signed char mode = true32b;
 	SwapMMUMode(&mode);
-	// Patch debug and CD-ROM disable bytes
-	romdisk[0x31] = 0x44;
-	//if (dbg) { *dbg = 0x44; }
-	//if (cdrom) { *cdrom = 0x44; }
+	romdisk[index] = patch; // Patch byte
 	SwapMMUMode(&mode);
 }
 
 typedef void (*RDiskPatch_t)(Ptr, char, char);
-static void patch24(Ptr romdisk, char dbgEN, char cdromEN) {
+static void patch24(Ptr romdisk, char dbgEN, char cdrEN) {
 	RDiskPatch_t fun = (RDiskPatch_t)P24;
-	fun(romdisk, dbgEN, cdromEN);
+	if (dbgEN) { fun(romdisk, 0x00000031, 0x44); }
+	if (cdrEN) { fun(romdisk, 0x00012CAF, 0x44); }
 }
 
 // Figure out the first available drive number >= 5
@@ -134,14 +129,14 @@ OSErr RDOpen(IOParamPtr p, DCtlPtr d) {
 
 // Init is called at beginning of first prime (read/write) call
 static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
-	char unmountEN, mountEN, ramEN, dbgEN, cdromEN;
+	char unmountEN, mountEN, ramEN, dbgEN, cdrEN;
 	// Mark init done
 	c->initialized = 1;
 	// Decode settings
-	RDDecodeSettings(&unmountEN, &mountEN, &ramEN, &dbgEN, &cdromEN);
+	RDDecodeSettings(&unmountEN, &mountEN, &ramEN, &dbgEN, &cdrEN);
 	// Set debug and CD-ROM enable flags in storage struct
 	c->dbgEN = dbgEN;
-	c->cdromEN = cdromEN;
+	c->cdrEN = cdrEN;
 
 	// If RAM disk enabled, try to allocate RAM disk buffer if not already
 	if (ramEN & !c->ramdisk) {
@@ -160,7 +155,7 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 				// Clearing write protect marks RAM disk enabled
 				c->status.writeProt = 0;
 				// Patch debug and CD-ROM enable bytes
-				patch24(c->ramdisk, dbgEN, cdromEN);
+				patch24(c->ramdisk, dbgEN, cdrEN);
 			}
 		} else { // 24-bit mode
 			// Put RAM disk just past 8MB
@@ -174,7 +169,7 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 			// Clearing write protect marks RAM disk enabled
 			c->status.writeProt = 0;
 			// Patch debug and CD-ROM enable bytes
-			patch24(c->ramdisk, dbgEN, cdromEN);
+			patch24(c->ramdisk, dbgEN, cdrEN);
 		}
 	}
 
diff --git a/rdisk.h b/rdisk.h
index abf3a86..5502ac2 100644
--- a/rdisk.h
+++ b/rdisk.h
@@ -4,8 +4,8 @@
 #define RDiskBuf ((char*)0x40880000)
 extern uint32_t *RDiskDBGDisPos;
 extern char *RDiskDBGDisByte;
-extern uint32_t *RDiskCDROMDisPos;
-extern char *RDiskCDROMDisByte;
+extern uint32_t *RDiskCDRDisPos;
+extern char *RDiskCDRDisByte;
 #define BufPtr ((Ptr*)0x10C)
 #define MemTop ((Ptr*)0x108)
 #define MMU32bit ((char*)0xCB2)
@@ -26,7 +26,7 @@ typedef struct RDiskStorage_s {
 	char initialized;
 	Ptr ramdisk;
 	char dbgEN;
-	char cdromEN;
+	char cdrEN;
 	#ifdef RDISK_COMPRESS_ICON_ENABLE
 	char icon[RDISK_ICON_SIZE];
 	#endif