Remove debug IRQ disable/enable from PiSCSI boot ROM

[pistorm] / platforms / amiga / piscsi / device_driver_amiga / bootrom.s

diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
index 18826aa07edee6dd74a98a43fbd810f25f398db2..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
 
@@ -300,7 +300,7 @@ NoZ3:
             move.l  d0,a1
             move.l  #0,d1
             movea.l  4,a6
-            add.l #$02c,a1
+            add.l #$028,a1
             jsr InitResident(a6)        ; Initialize the PiSCSI driver
 
 SkipDriverLoad:
@@ -320,14 +320,14 @@ PartitionLoop:
             beq.w EndPartitions         ; If the next partition returns 0, there's no additional partitions
             move.l d0,a0
             jsr MakeDosNode(a6)
-            ;cmp.l #0,PiSCSIGetFSInfo      ; This does not work for some reason... not massively surprising...
-            ;beq.s SkipLoadFS
+            cmp.l #0,PiSCSIGetFSInfo
+            beq.s SkipLoadFS
 
-            ;move.l d0,PiSCSILoadFS        ; Attempt to load the file system driver from data/fs
-            ;cmp.l #$FFFFFFFF,PiSCSIAddr4
-            ;beq SkipLoadFS
+            move.l d0,PiSCSILoadFS        ; Attempt to load the file system driver from data/fs
+            cmp.l #$FFFFFFFF,PiSCSIAddr4
+            beq SkipLoadFS
 
-            ;jsr LoadFileSystems(pc)
+            jsr LoadFileSystems(pc)
 
 SkipLoadFS:
             move.l d0,PiSCSISetFSH
@@ -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