From 5f1fd16f3c6d80457a11d397c3f4d7a8afeeb159 Mon Sep 17 00:00:00 2001
From: beeanyew <beeanyew@gmail.com>
Date: Thu, 27 May 2021 13:39:15 +0200
Subject: [PATCH] Map the default 128MB of Z3 Fast on Kick 1.3

This assumes that the original Z3 Fast map line in the config has not been edited.
Z3 Fast is autoconfed before this on newer Kickstarts, so they're unaffected by this as the memory range will no longer sit around at $10000000.
1.3 PiSCSI autoboot still doesn't work.
---
 .../amiga/piscsi/device_driver_amiga/bootrom  | Bin 2060 -> 2144 bytes
 .../piscsi/device_driver_amiga/bootrom.s      |  19 +++++++++++++++++-
 platforms/amiga/piscsi/piscsi.rom             | Bin 16384 -> 16384 bytes
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom b/platforms/amiga/piscsi/device_driver_amiga/bootrom
index a1470ccac773be0ae7057b4ac0018f4e6a6a08ad..c83fa552948c215a74bc3f0b10a050eebfeef1c0 100644
GIT binary patch
delta 612
zcmY+AziSjh6vyA}OyU_qu8<QgWV|c1un@Ho0!g?Zh7gwH)<P}Ri#vhE%g$wY5AHxr
zN)ZuZA(gd)NH~Z^iXd8QWo0FjKR{AgNr+j$Z#N1KyvO@~=FR&t&&s>y@k!CXG$d8M
zUM8BY9UNwR8Am$T;~mz^y7n<=(<LIRP7|q#WJ*5*qx6%z`Fo>wfbhgRk*@D&lc^TB
zC!W{$4>z_RizShMcV@(VdQM)c=qI;coS&!C+@5Gx7u?NkN-x}ho8Fb#%qdjJ5BHE7
zb`5=Y3Z}M8<gSAKfL2FrjPM<78}=c6sV<!P`V=Y4vANf<@y$`+aH0VEwe?NC7RQBa
z?_33Gr|Xla*WPfcMcegTLC<)jI58_RkZiDPd3@6x1_=}iv>?^)MoEwaHe9r}&zQs)
z=FQOmcf}QmocD0D8Lke@z_`}uL7WOR?_tm{_}Ls{2Q(`NaJwtaq)sm%tE}<*<kSaI
z%R>N+Z|Au>Cbom<LB5-u1ydc<!>s@D&QUHFh?8O_`3lTwc?}!pZx#NEwQGj?j`B0V
uacwh9qQJyApiuiF9FqQSEO!~s^&->tNBl#^2LM`vLmq}GG&jSMKmP!v#*YvH

delta 515
zcmXv~Jxc>Y5Z%4qkcbds8c7NXD%c1Hdr`bg3JHhgY|<p2X2rwg_HrMR*cdD&Sa^-U
zKsyP<(%N5OVVT0xO00q;&RoucS!Uk6-8XN?nL%clrrEV$LdasDkiuq{aCI`%!aA)b
z2I^$`K6<4mG%T<kx);{jc6#+-Ye9dW<_nEN>i8vmWV78BxE)0bPGt=FLkRch7<W=c
z?-0Vipyx4m4rL3{f$WB#d?R;v3zRcYG&JcQ^&Ejj3ea%0o_L})Zd_Q7=31A+tw^&O
zP2mB;u`63GVe~v-v^{_rim<YQlTz1;)}U9&Jv3e4@-1msqy%LMdLI^(%h!D<S;_7M
zA`rT4qB#9P3{_(sTE#^yR@2Qk^3X2fF{Zl0^d+*QFCdB<xMc%dqTm<9R#oB2z&(xp
zF&yx!2;Y)RwQM|xl|3JQ0KE=}QZ_VcM|{3N?{(3QT(KJ@>9S<|t|j6-<2mQwB6|pn
SspVXLj)FQAAc`+Tu<t*f+jA5E

diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
index 70f0af7..2572125 100644
--- a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
+++ b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
@@ -66,6 +66,7 @@ CloseLibrary    EQU -414
 OpenResource    EQU -$1F2
 AddResource     EQU -$1E6
 Enqueue         EQU -$10E
+AddMemList      EQU -$26A
 
 ; Expansion stuff
 MakeDosNode     EQU -144
@@ -261,8 +262,24 @@ Init:       ; After Diag patching, our romtag will point to this
             move.l  #3,PiSCSIDebugMe
             move.l a3,PiSCSIAddr4
 
-            move.l  #11,PiSCSIDebugMe
             movea.l 4,a6
+
+            move.l $10000040,d1
+            move.l #$feffeeff,$10000040
+            move.l $10000040,d0
+            cmp.l #$feffeeff,d0
+            bne.s NoZ3
+            move.l d1,$10000040
+
+            move.l #$8000000,d0         ; Add some Z3 fast RAM if it hasn't been moved (Kick 1.3)
+            move.l #$405,d1
+            move.l #10,d2
+            move.l #$10000000,a0
+            move.l #0,a1
+            jsr AddMemList(a6)
+
+NoZ3:
+            move.l  #11,PiSCSIDebugMe
             lea LibName(pc),a1
             jsr FindResident(a6)
             move.l  #10,PiSCSIDebugMe
diff --git a/platforms/amiga/piscsi/piscsi.rom b/platforms/amiga/piscsi/piscsi.rom
index 738851218e13040ad5fd79ce0995bf41c0209278..c677e97ef4b6eda7dc43a8a61dd2b291793f20f1 100644
GIT binary patch
delta 616
zcmY+A&ubGw6vyA}Y};5tdXR_;GA0K-2#R_U3Tep?N-0aodQcB)>P}&4x|8m1AOW#^
z6b~XS^yIlhkrIf99*XEuPo6x9_y<VOQfk)k+f>1U_jupWym>z+Nko!};Th4q)+f7k
zXO3v0d_2w$GmccQhX<_JRQY4h<_knrnkTZS;#u_+jM7ie-tX=5F~ZXck*XeL)2R~o
zr(RZ%#@nN3VpXKyt%_JmFUgxl_59we%S%*PJQU5+va^@Xs^!OT(}yyvoJEEFa1W_q
zx6$Wd!tDJ5Ih$ZVq3shkMEDN25Bre5wy&K3`T{9yk$zM&(cM8;bD{wHHTq`15vPP>
z9^3+HrpffVtz9m)V%lEA?`U@r#d;$Gk~MY>mv8EQKZYWK7GyWuVeH4g3092hGA8kb
zc|Gv{U2z2>>ph&T2b(?J(~j|Y5Ua?{UH7{aej$h00nH`@IPDE)Ql&R$id(!sS=C<H
za1j9G+j*{*j!Z9nlJ6!L!0eXpVAlV5>m(NoMDb)MxdUc3+?omUw>JKYwWIs_j`B0V
zaZEjkLtjS~DAc|Rhorw7%O4CEJE3lS1O6fH0RXMSArC`L^v+0K+?^R&bK~oO0PcN~
A8UO$Q

delta 519
zcmXv~F-yZh6u!${X+<cuOR<6k6<mZCcTr5*K}wLurAuqICkESIo1~Ju7#u|$%;GQ5
zO$v2%_7^xfc5rlbDw6tM8V}y_-uJ$D-}}z@sqfQKnr7F32_cI<A?lV#xHg^XL7mnT
zciJ@k7{AdI8mMfC?ge$WonAXAEEq3gUTvtU<JaJc&30E|Iyx!1l?lWTA>5r~yq6+I
zpAhy9HIK1#NZSxS2ru~Jo6GmNKsj?nLzm9cuqTj60UC`r63?{8%?qoi+t#J9E3(;&
zy6^zuSe31|Fo%vSIu1Y#MOfLyPRX;PHRu&`51Y1Yxt8o!qy%L+^dTrFbJsqktkmrf
z#6TFbh2r!RF;tClC>0yASj}j5kcV~&k1@>_O;;i-`U0Y81G{WuNfi8I*s3ZVIj~P7
ze+(PEDuVZ9rk0KSu(IQ#51`lKQp%<-yAhx7&uc??kt=qCBtw?Eu5F2UW-{meTV#(x
YF_p{Y=P0N{0;2V?x)LVG%2HVP1BUo^asU7T

-- 
2.39.2