From c96635c63a3361c6e29db1bd315ebfbf7ea475d3 Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Wed, 9 Jun 2021 19:15:40 -0400
Subject: [PATCH] Fix settings decode

---
 bin/driver7M5.bin | Bin 1917 -> 1927 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |  28 +++++++++++++++-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 84af299cc0976fb263396c405aaa75c8c3580876..ca6cb6ee74574260e6a4b2e7ea0ae01a6a3952dd 100755
GIT binary patch
delta 470
zcmey%*Ump7(0GT>eP#x~Qjg~h2ND?=H-LBvN)R3^6Ntx?!NABMmBt5C!xpfy#hQ_E
z!Q=ysiGl`d0W#VQa%l{V|HNy6>f|Q-F&WkiME0*NRS=Kp-_VuB65N`0#qm9ZS`kYD
zqlbe5<AOjSPrZm0#`9tU>J}5wXHer{U|>jRV0a~_&!Eo4%)ltez{JkL;&LGBs0*tT
zo7ZXvh42HO2V5FF4<Bntckr^{*#uPm&Y*^oM@c}*@$#Sl9SjT#7K|K|pD;z%FY#he
zV_;Zv^?=__hgP{Jm23u$t$!FQ7#MP-6to!>fI8=Ru>w`h5z}VSg{ksl1B%ac(q>==
zxr$*%!G53nF+U>u{YoVmm{=H?fG%WAmxH;lim{Hdg0Y4%f#JV^6T1^j6^O;=#0(N=
zN_a7O9kXJvh8KG}!~cw{e;k0013M)^+<`#{s4&Ef6)01JCZh|KN$_Gx7qYBjn8u)F
zpu@nz;Gn=@>A=9^1#}irN6=&imdT6<CU0Sx$g5XyE`i~nM!^*zskAwQRh0<<ALoZS

delta 455
zcmZqY|I0Ta(0HBCeP#x~Qjg~h2ND?=H-LBvN)R5)4-k(hgMpDjDvb}OhRtnbi!~$T
zw8;k;6Ll5T0%Wuq<kA=z--*`%)yX-&XHY9*DPZ()FkoB|2;`|3vBG$hjhGCBH6r_0
zmMVxx^l#`&VhL_dyW+)?CL*BEpvJ+#z>v<s@J>vhL7j=2fl&e|_VP%%BbN&U$IBz`
zj83dxs~Hr+4|pDMY4ALJtRdaO%YtVUP{+N=7nri^r+BreF)&QIdcbd|L#teqN;ZSW
z);|mt3=BC^3fc?`Ky^J{EkG4rV%iM4FjZb`AaN&c24*i-pj=zQexLg>KO*}5N~IW>
zSQ(grZemPlVB7_BQx#(kV;y4!V*<l}KJ^-g2B4D_3MxDtlxilQVipdx@M=$I_+N4L
zk3$Co1K1q_;tmWtK-DQ;E$J<2;<`ZbA}`i-A<G(uX$(pRIt(lf4hjsG4h$?_Ko<c`
nN||iHGMVwx<RdH-g&hjcB{2N6D!2k9O`Mp4q~GQwR#hediExLt

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index a0c8cbdfdbe7afbdb2978294d678f805b26cb444..8cc7c4e4072f4b4ef28f9635bc77cf2144156551 100755
GIT binary patch
delta 988
zcmZ9`J4{ny7{>AUYtLyxK?^D<LMgRev|Nf;5HF=xg(D(21-us278SK3C}M@iKr}9B
zOss=34lKrn7!A5;jnO!{2$KV&#z7Yo9SHcZhQ;A`a^CNK-sFi!qgpg!SPh$o&BNL=
z{Y}og7j@HSsqd@#BJmDU<B2KY{5R>Q#FWw{O0t5B<};RtiJv)ol~Rvlo?N{n%~Q~j
z?G}4b)NE#is6F;7S1%v3wU0jTb7Z!Sj^FCknn!|@)jy=5M+>VOuSY#<WGd{@=O;ts
zJi}Hd1xX?j68V-<CWR)mD7%=fqWR+o-}!Z)#dso))_85)AFX}+J{s~G6)8_ifA>UG
ziqqz-{xmapQ^ZlBl430my?toRum(lOrsDN4y(9MPt}{~fd`9|3y0aW^ad7&;&`CVV
za7)R2%CPYM(B~F&qL$nbzpk4;{JU+mzHhmhG%-<8h3xYM2h^bIR}mGEIh)Vw(*_cM
z7N0rsZVG&j+4J<g<|4xylDV#_887wzc4^4;N-@b6Lub?b-=>63z|cbJl@YloPEWCD
z;&n)+S2TlOTr|aQ=jnG<JmzxhcT!8k9|JO56rSYkocQ3>^G!E?xpY`yMG}&+01J_V
zR4l?`*pP;FEWuJNLk2Rj94nB8mB>a8?8t=!d2nJCT*yZO3Q>gBSOYhTQG!yG!Gm(F
z#X79V25iJ8RG<=@QH3qoifz~qFRJ0g4*0PXyRaKIsD*(&sKZ{=V;>sOh$b|n1^aOT
zt!P6#4&o3F;|Px87y{@(CywI;P9lg9x^N1oaR%Kui*q=SFfO167txD8T*77a;|d0F
P6%ky+;KVQ2Q1a(La7K1i

delta 982
zcmZ9`T};h!9LMqR@0|ZXNs^)x)&CqlaY{v~JpD`R^p~ULAw&;y4)SnB969RDPO@fe
zrgd(cxiOnHV~rb`=F&y08yC7XH{6(Y(eOU38yBzN_Wk}ozu!KgP)G|!g;m%VwuiNs
z`n!xR&+F&x;^}dJk;!&Z<I$<j`ESzZqf`7jQIhUWSj@!KO#H~ucPKR)DbCW{3ys`{
zbuP*Diu#rsB$`?IU2?lMzjB+!YOIkduUlW7B9F85lBWFQ!%usR)aK#wp$@HSz&m4U
z-c^Z3k{c@`K9O%JMUrQ;i%Mhnb?RniT(!i0ovKw;y7f$qW0Q50)uFogA3{FUDvN)?
zi_a0$(7XCatU<5H$n2!&wK<S^H@i#nUoA*L<YKzv5`*9aD@<Z2#U+J{DJv$ruX2gq
z(z(0me_KD-GT%Jx=}8xxE;dRjpQtyBrFvCR^{Ierlivw>K?%{>@CV$cGZ?9G=*f*`
z)}T**2WA({`yzjfG^CnRK)llm`@;Y23)y#Dx-Y3bD5K&mE)Y#jL&{CjEGqF+XJpKw
zKT^|?Qm6hf+4O&GlV2778P3uwJEv!2+NtN*?6xN=;#k|7J{XsyBL+(li=~LeGQ?v!
z60ib^ScxPgV-;2-1*u5G8btqHi*?9ACbD3_0VmcY8#%~D9`dmP8{t9$3b6@AC`Ji3
zV+%^L72B{KWhh4lc3>xVVK?@`L?x=Q7uDE@8q~s#I#}3`dK`cU2ho5=96}Qg;|Px8
z7@Bb$CvXxiIEB+_MH|}DfivjDS$N^YIh@A@bm1Z{;WDnkkE`g$HC#szZr~;YxP@Na
PMi6(<HxZZ9|MSxy<!lH~

diff --git a/rdisk.c b/rdisk.c
index 16145f4..5443e40 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -10,11 +10,6 @@
 
 // Decode keyboard/PRAM settings
 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);
-	RDiskReadXPRAM(1, 5, &legacy_ram);
-
 	// Sample R and A keys repeatedly
 	char r = 0, a = 0;
 	long tmax = TickCount() + 60;
@@ -25,32 +20,39 @@ static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, P
 		if (TickCount() > tmax) { break; }
 	}
 
+	// Read PRAM
+	char legacy_startup, legacy_ram;
+	RDiskReadXPRAM(1, 4, &legacy_startup);
+	RDiskReadXPRAM(1, 5, &legacy_ram);
+
 	// Decode settings: unmount (don't boot), mount (after boot), RAM disk
 	if (r) { // R boots from ROM disk
 		*unmountEN = 0; // Don't unmount so we boot from this drive
 		*mountEN = 0; // No need to mount later since we are boot disk
 		*ramEN = a; // A enables RAM disk
+		*dbgEN = 0;
+		*cdrEN = 1;
 	} else {
 		if (legacy_startup & 0x01) { // Boot from ROM disk
 			*unmountEN = 0; // Don't unmount so we boot from this drive
 			*mountEN = 0; // No need to mount later since we are boot disk
-			*ramEN = legacy_ram & 0x01;
+			*ramEN = legacy_ram & 0x01; // Allocate RAM disk if bit 0 == 1
+			*dbgEN = legacy_startup & 0x04; // MacsBug enabled if bit 2 == 1
+			*cdrEN = !(legacy_startup & 0x08); // CD-ROM enabled if bit 3 == 0
 		} else if (legacy_startup & 0x02) { // Mount ROM disk
 			*unmountEN = 1; // Unmount to not boot from our disk
 			*mountEN = 1; // Mount in accRun
-			*ramEN = legacy_ram & 0x01;
+			*ramEN = legacy_ram & 0x01; // Allocate RAM disk if bit 0 == 1
+			*dbgEN = 1; // CD-ROM ext. always enabled in mount mode
+			*cdrEN = 1; // MacsBug always enabled in mount mode
 		} else {
 			*unmountEN = 1; // Unmount
 			*mountEN = 0; // Don't mount again
 			*ramEN = 0; // Don't allocate RAM disk
+			*dbgEN = 1; // CD-ROM ext. always enabled in unmount mode
+			*cdrEN = 1; // MacsBug always enabled in unmount mode
 		}
 	}
-
-	// MacsBug enabled if bit 2 == 1 or not boot
-	*dbgEN = *unmountEN || (legacy_startup & 0x04);
-
-	// CD-ROM enabled if bit 3 == 0 or not boot
-	*cdrEN = *unmountEN || !(legacy_startup & 0x08);
 }
 
 // Switch to 32-bit mode and copy