From 3168b13b6fe36cb44a2035eb6c9ba8a97e3e6f38 Mon Sep 17 00:00:00 2001
From: beeanyew <beeanyew@gmail.com>
Date: Fri, 25 Jun 2021 05:07:47 +0200
Subject: [PATCH] Remove debug IRQ disable/enable from PiSCSI boot ROM

This somehow broke the interrupt handlers for a bunch of things, including the standard HDD installed version of Monkey Island II.
---
 platforms/amiga/amiga-registers.h             |   3 +++
 .../amiga/piscsi/device_driver_amiga/bootrom  | Bin 2124 -> 2108 bytes
 .../piscsi/device_driver_amiga/bootrom.s      |   4 ++--
 platforms/amiga/piscsi/piscsi.rom             | Bin 16384 -> 16384 bytes
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platforms/amiga/amiga-registers.h b/platforms/amiga/amiga-registers.h
index 9882e6a..2012208 100644
--- a/platforms/amiga/amiga-registers.h
+++ b/platforms/amiga/amiga-registers.h
@@ -39,6 +39,9 @@ void adjust_gayle_1200();
 #define POTGOR  0xDFF016
 #define SERDAT  0xDFF030
 
+#define DMACON  0xDFF096
+#define DMACONR 0xDFF002
+
 /* RAMSEY ADDRESSES */
 #define RAMSEY_REG 0xDE0003 /* just a nibble, it should return 0x08 for defaults with 16MB */
 #define RAMSEY_ID 0xDE0043  /* Either 0x0D or 0x0F (most recent version) */
diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom b/platforms/amiga/piscsi/device_driver_amiga/bootrom
index 83b3bbfa6be7c6a154e09f222f9ac9c6ad82b292..29682be5299d4d12e6b9cf650e72c8b22f2e4341 100644
GIT binary patch
delta 505
zcmY+AKTE?v7{>2%=buSBRr~}lBKQ$Xo9Ix2G(~W+1arb^n@cZAX+f}qgNTEY#mT`h
zpwLO_2XN@*C+O(lAR-;41mE|X#lR(be)qh0&-+eF<I?TyE^pDb?1&yN9aMkwhiptM
zw3Ov^GJ3aO=+2Z7>xU42NzB8CtHkXR!ahOrg7x9|9M%xlRW|0E8~4{>If+H9rsC!x
z5@@7=UPp8OMD0D0+&hy|P0OCpb>#=f@rWFiBiq6o#EIy{fEZrH91nNwzD$hwIr~~(
zmv2~MhrzzD6PZXAq8}n-T!uH8(>!E!hRhDTsYr#Z0t{tsAwyrmk@b)j30%KpeA6si
zDPQ0uh*eFsV@@R2+*rMah*heOO`8l5;SJG-u>W|u@InW1vWUq}fmx1MQ=zHl&4qSF
z-!#c?u*Ow(m}n{DT~MGu-~~l>r6Qxv)GBQ){9u6X3NuW?w--JLfi}WJ^C9f}4?_rc
AHUIzs

delta 523
zcmY+Ay-EW?5P)}Y*O<a0h4}LVT8q{~NbYRH5pp8f7!PlS#pE`*A4x3KQp6&1A|gJ3
zh#(k?2v(Mo!Z*+dND(Z8hy-UgX<XQW`R<#&nR&@{Gp#{-`ImIaNB{bKP^PJ5gKkc2
z<$i{j$rH`exnw}QU>s|s{c1eZr9L5y6T&ZuKD?DCb{$v`Qs8*_3EVTdEx1?7Jzt!^
zJq2Yq6y>}M*PAtg8U^&$?(qj|7O~3NleK&x_eD@puBVMV<d|8qBAjLziE0RlO=GYe
z{9-m_q}@*PnVOaFSYi5J(G4OQN#&zYhym>ohJVnnImqY`nd#SK5er*+*p#t?481W&
zc8F};f$dhc*H5-5XO3_a#K^^grC%g$N~=yugenep^q4FIjF&_On*GNY#x6_{Mx!>_
z0lsHBdFAU`j%$G277aZlyTKY;nSK;V5w1Z7`8NcR3QE;<{s@t0D}ivmCXOrgG6`QD
OdC&xEgyURr*w-Ip&wZ%?

diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
index 2014567..8e883ee 100644
--- a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
+++ b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
@@ -260,7 +260,7 @@ Init:       ; After Diag patching, our romtag will point to this
             ;
             align 2
             move.l a6,-(a7)             ; Push A6 to stack
-            move.w #$00B8,$dff09a       ; Disable interrupts during init
+            ;move.w #$00B8,$dff09a       ; Disable interrupts during init
             move.l  #3,PiSCSIDebugMe
             move.l a3,PiSCSIAddr4
 
@@ -401,7 +401,7 @@ EndPartitions:
             move.l (a7)+,a6             ; Pop A6 from stack
             move.l #803,PiSCSIDebugMe
 
-            move.w #$80B8,$dff09a       ; Re-enable interrupts
+            ;move.w #$80B8,$dff09a       ; Re-enable interrupts
             move.l #804,PiSCSIDebugMe
             moveq.l #1,d0               ; indicate "success"
             move.l #805,PiSCSIDebugMe
diff --git a/platforms/amiga/piscsi/piscsi.rom b/platforms/amiga/piscsi/piscsi.rom
index 59f9d6f2b3f267d2fc096710f7db8238fdce0afb..f6cef1ac1475df4d04f8f8d0a575aa267dbddba9 100644
GIT binary patch
delta 509
zcmY+AKTE?v7{>3C(>h6~inzGBh~g)Z(k3{RAWacmEWw;`+UC;yDJ=+Qa46!SWN~uv
z3n*k#`T-oo!B5c9!NEZ~ND030HH(1@_x$d8@1FNf5}G9RW_p{q>2i8R4;Kz<zxjPS
zrd3)_bNZHjXwP(KLWuT52)iWeW62V+dW7g-AX&i%usw&Bz#64vwy}D51(uVLx9c)&
z4SkMA3g{)9u}5m`fn@fX@auu-^PnLeS2-S#qcTN@+ru#8-4KwD59y|jC&oZT%KMal
zFRqAJtS~%x-w7fS3F)C9B4b<~Ur@K%$mkTA;q_u3b4$7yO4~$+zJep`BP$YEPFMLR
zsb8vG;3SAvivv^LNVJ)<+D#tHI5<{q>VODq@(zUk$18;wItZhAO#Kv?X4-Y>san>W
zYl{z5llnE*SkmyKK=5!E6zEU*K~Y0WUuiY9YA4{1JH&Rm8YW>|b03628)06yzV=?q
Iv~s@v2lDE9NB{r;

delta 527
zcmY+AKTE?v6u|G2v+dx}LHvV@la3-fE2T}Q5=tY2i#3=Nf^DwNA88$GMiGZfL`3`m
zB7$HX>f+!i4t@ju03A9N5h=cR?c%{bc)$GK<-He0G>T|vkXijDUGmw#J|9$QD&C^o
z6Fd2z;br_pb96Qy(04E*X(X@8GhOKuqB26*1(An!GQ?;A>p=<}4?BT-2DbzED!yk+
zbGN6U?EAb@5dLPX&QYU)-jW`Bpjrv5%mb%h@SH>L6@_I>;|@7yx>Mz5%MW<X2c%A6
z&`tcJHJw1Z-S{gt<9uL+=GrC83!K0aF8YKh&<;`Y5Arn=866_i+(yVlZU`HjQr3{6
zH|EIN$i^KQR!w^ScsD(LjGG`zKJ;|?B2g!$YL>Y#LT^uwsb+z(GOt3j|M=qAg$ev%
z)TVlb@9AbixU!bv8Xz}#Qx2)#V2vR(H}D+pZ$Jk5Hw2K1Leypc2$AKg9=Gfkj?3jT
W30og|&;)9PwUdSUmvo|Jhs%E`s(`Bi

-- 
2.39.2