From: beeanyew Date: Thu, 27 May 2021 11:39:15 +0000 (+0200) Subject: Map the default 128MB of Z3 Fast on Kick 1.3 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5f1fd16f3c6d80457a11d397c3f4d7a8afeeb159;p=pistorm 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. --- diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom b/platforms/amiga/piscsi/device_driver_amiga/bootrom index a1470cc..c83fa55 100644 Binary files a/platforms/amiga/piscsi/device_driver_amiga/bootrom and b/platforms/amiga/piscsi/device_driver_amiga/bootrom differ 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 7388512..c677e97 100644 Binary files a/platforms/amiga/piscsi/piscsi.rom and b/platforms/amiga/piscsi/piscsi.rom differ