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.

diff --git a/platforms/amiga/amiga-registers.h b/platforms/amiga/amiga-registers.h
index 9882e6a38b74488c0f468f9ce0bd460b4047f615..2012208db405702a089d635f36cf7e85cb2ad330 100644 (file)
--- 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 (file)
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 20145670b352e847a4afba3b9e110062e04fe268..8e883eeefa7b782cdfa1a8b0da4441725af5a2da 100644 (file)
--- 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 (file)
Binary files a/platforms/amiga/piscsi/piscsi.rom and b/platforms/amiga/piscsi/piscsi.rom differ