From 83af6e36f8b63073da34380e459f4b0edcb5c2d8 Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Wed, 15 Jul 2020 02:14:32 -0400
Subject: [PATCH] Better PRAM options

---
 bin/driver.bin | Bin 1691 -> 1771 bytes
 bin/rom.bin    | Bin 2097152 -> 2097152 bytes
 rdisk.c        |  30 ++++++++++++++----------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bin/driver.bin b/bin/driver.bin
index ee4e7a63b3e256b97ea28cb2e7b74db4c0bf79da..e70c6111a15aa71892ed830a5b4db180316e05dd 100755
GIT binary patch
delta 427
zcmbQu`<i!xt#OLaeP#x~Qjg~h2ND?=Ye2jNB?yms8i>b}!NABMmBt5C!}4WfK|?@f
zzdpA<mzt;7N(Pa1E++?-c(wS5e!o)3_Y7P`ECq}n4hD=10)ag4B32krK%aq&iGhKg
zhk=15{Y-({awP>0bq@v+uZHxZ$y|)`j82oa811AI82-l@WiYU9=*(kL;0$U|2uN5_
z@DeEMHMxaR+4+-7fP@x<Tp9zTj%W?gX>wv(3<_xs3|G7?7)x`?1S}X!fR->yFng_H
zPzpcj(dco|qrv0AfyQ(PFAJVc=?n~;Ccj~{<zC>V#lY;v4AePmvI&!x9R~vgL%I;q
zjp88fPCx_17(q@EVqjuqU;@fArt`sMix|ro6Ye=NB>Zq<aAF3kvY0%9Nt-cl@*XBx
z#(>GUm<kymO!i@R=bce-E`j0Sq=G9zvS;!FW@SdN#YdPKnUw7&A7e3)G0<dSVQ^4j
hFm_;IF|J{l#-IeUvET`ijGDxHYVtYO4U?<b6ai%|bmjm6

delta 351
zcmaFOJDYcct+9yDeP#x~Qjg~h2ND?=JwUt!B?yl>0>tCVU|?jBO5=m6VOcV<pg~HX
zTc1nK(`zMzNLo&T+HxfY4s{O(5wC{yvdIpN@{Dei6BzAeoE%i*)#Ck1jWQV6Hgx8(
zC~yWfC<G)dDR`OiZ1N69W!D!f0TNmaa%l{VN}@GDYvjbV7!=YN7*2UvFqY<22w5<e
zFflSPN-%q^Vo(Y{;L+f5z@@>X(c|EO#&icS3!Y8s3=GRA%Q4w<PjS*>VD@4L>g}7H
z#-wG$!@$6p#v!E7AfCYRKP8j_$Y)Iw0P#TvmN8Z^0>%BD7!$rZ0eL{S)8unZ+KgF~
ze=*52#!QxAE@XT&xr^DIcS*sy1cra}3a$Xj8I$iZD>GUwW@2GvQhGO;h1GxysI#Ep
Y36RX09Kd>Nq5#WeDYgxh&#}n@0F~Bdj{pDw

diff --git a/bin/rom.bin b/bin/rom.bin
index b34f15021a4e8573a9023267f65c1008cbc60781..21b96d7f227d253a97523f1741107120cf668ceb 100755
GIT binary patch
delta 582
zcmXxeL1@!p6bJD4l6+m4c3rG(SL>RlNvT*1Emou#ON<9&kWoc&I@uyfvx7)1b_eMp
zgMtXcM4_MTw1YAg1Ra7G58YM7({94tK@hzNvV$k}1?l1U!T<Z-_udPF0E5r~2f{!c
zNN?GzeB;LXFCxtK>~Ao-4%iQqtN%~pFii1fK*)6x;~Ht7@8wz0zOq(})#UOy=LMuZ
z*)mH@<)!(xx!&oYAa^AnZL^LW7bwNLY@C!D$O6Db96<6u`sGbsiypBd<pf@r-&I)w
zExxX@R?daLi^rEC^7{TQNt?VFXl?ho|DA3fzOORl%&$^ATLHBLSWWk7KQ&VUtpl**
zG_iMcMQP$4nuA%<c?tUEZF|+;wgY=KTJ=n)8Q<~%w)nLII~CioDj+%{eO>2I3#`(L
z0)UsKMQ6eW7PZJ=xJ?oS1c6@BON?K;xPtDk1@3PPERm|3LyaB7MPAid9^2f}*lpb7
z?=^OI>WTl!g+Gt{9XcOyrN|6)Hcu283Py{c)LDJDeiS4yHE5V1HTp0FJ)G-*rSmHH
zb@qY#Z_<|@KNPFONL1sy22=PCgB9;Blo*MS2@)lfL?$s3CsQOrrinrhkR&-sQY1|>
XWQJtPA(A79$t=ke_1!|L@a*$H16H1K

delta 588
zcmXxdPiWIn90%~<Yx-)|c3Z9OR%_FwS*RNSROY3Zh8g@5!w5w-6ecW+q+^y5$2xi#
zl0iYeOhMV($y0SG3RMKbQ@u$M*+IN0>OuSi;$a656O6wo9zH*Q-}ig(_dL%dUZ6!<
zp%&K)KcNqW!>REP99RwG3v|x`F@j{v{}Oj5NbwmUkaY(B-wC(bM}d0TQmhm$o;2@4
z%Bj1>by?zf8;~-++9K=ZsYs5qjXc$I`j|3ZoVFUHGZ5)qn+r>Qr#z`@x7}~{XSPSA
zBgeif)r<;x2Z)?r!oTuEDo74M&n%Nhy_qbNg%AOf;mrFWpY9r-(LL%J%f|EWa&62k
z#~;@K?y?n;R${kw6*!Z_$1CiONY&9e0CD(a35IR(FH8bvdOi{4VC5od5<ItbV*k`J
zVXreyqWj1!o0X_Q&a$f#y+ppVEs37!Z@aH-_<h@bjdhJ#1v)~?>+=OlLh=u`Ak#xp
zT;RH&u+~{uroEdtxG-}cr6;i2zZ&5srYbbSG=&P)cLy%QLH|8g$=|@5^IuM0H|G4#
zJcz`420cx5)XEZs{IyCQ!v5;t>17v0!07``+}q?ffj_eKD_3~IZJJl66pA8f8{$zP
rilP{bqkc4i22lcSM@h5;rBE6Tp<$FkJ5d(xLOCR${L?8#yz}-CUb?Yw

diff --git a/rdisk.c b/rdisk.c
index d92958f..0da0e84 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -167,32 +167,30 @@ const char const RDiskIcon[285] = {
 static void RDiskDecodeSettings(RDiskStorage_t *c, Ptr unmount, Ptr mount, Ptr ram) {
 	// Decode settings
 	if (c->postBoot) {
-		*unmount = 0;
-		*mount = 1;
+		*unmount = 0; // Don't unmount
+		*mount = 0; // No need to post event since it's already been done
 		*ram = 0;
 	} else if (RDiskIsRPressed()) { // R boots from ROM disk
-		*unmount = 0;
-		*mount = 0;
+		*unmount = 0; // Don't unmount so we boot from this drive
+		*mount = 0; // No need to mount later since we are boot disk
 		*ram = RDiskIsAPressed(); // A enables RAM disk
 	} else {
 		// Read PRAM
 		char legacy_startup, legacy_ram;
 		RDiskReadXPRAM(1, 4, &legacy_startup);
 		RDiskReadXPRAM(1, 5, &legacy_ram);
-		if (legacy_startup == 1) {
-			*unmount = 0;
-			*mount = 0;
-			*ram = legacy_ram;
-		} else if (legacy_startup == 2 || legacy_startup == 3 || 
-				   legacy_startup == 4 || legacy_startup == 5 || 
-				   legacy_startup == 6 || legacy_startup == 7) {
-			*unmount = 1;
-			*mount = 1;
+		if (legacy_startup & 1) {
+			*unmount = 0; // Don't unmount so we boot from this drive
+			*mount = 0; // No need to mount later since we are boot disk
+			*ram = legacy_ram & 1;
+		} else if (legacy_startup & 2) {
+			*unmount = 1; // Unmount to not boot from ouur disks
+			*mount = 1; // Mount in accRun
 			*ram = legacy_ram & 1;
 		} else {
-			*unmount = 1;
-			*mount = 0;
-			*ram = 0;
+			*unmount = 1; // Unmount
+			*mount = 0; // Don't mount again
+			*ram = 0; // Don't allocate RAM disk
 		}
 	}
 }