Update to work with zero page relocation

Detail:
  s/DevVersion, s/ScsiFs05 - Update debugging code to use OS_ReadSysInfo 6 to get IRQsema ptr
Admin:
  Tested on rev A2 BB-xM


Version 1.21. Tagged as 'SCSIFS-1_21'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.20"
-Module_Version          SETA    120
+Module_MajorVersion     SETS    "1.21"
+Module_Version          SETA    121
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "27 Jan 2011"
-Module_ApplicationDate  SETS    "27-Jan-11"
+Module_Date             SETS    "04 Aug 2011"
+Module_ApplicationDate  SETS    "04-Aug-11"
 Module_ComponentName    SETS    "SCSIFS"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
-Module_FullVersion      SETS    "1.20"
-Module_HelpVersion      SETS    "1.20 (27 Jan 2011)"
+Module_FullVersion      SETS    "1.21"
+Module_HelpVersion      SETS    "1.21 (04 Aug 2011)"
                         END

VersionNum

-/* (1.20)
+/* (1.21)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.20
+#define Module_MajorVersion_CMHG        1.21
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                27 Jan 2011
+#define Module_Date_CMHG                04 Aug 2011
 
-#define Module_MajorVersion             "1.20"
-#define Module_Version                  120
+#define Module_MajorVersion             "1.21"
+#define Module_Version                  121
 #define Module_MinorVersion             ""
-#define Module_Date                     "27 Jan 2011"
+#define Module_Date                     "04 Aug 2011"
 
-#define Module_ApplicationDate          "27-Jan-11"
+#define Module_ApplicationDate          "04-Aug-11"
 
 #define Module_ComponentName            "SCSIFS"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
 
-#define Module_FullVersion              "1.20"
-#define Module_HelpVersion              "1.20 (27 Jan 2011)"
-#define Module_LibraryVersionInfo       "1:20"
+#define Module_FullVersion              "1.21"
+#define Module_HelpVersion              "1.21 (04 Aug 2011)"
+#define Module_LibraryVersionInfo       "1:21"

s/DevVersion

@@ -37,4 +37,5 @@ DevVersion SETS "0.00213"
         GET     Hdr:MsgTrans
         GET     Hdr:SCSI
         GET     Hdr:SCSIErr
+        GET     Hdr:OSRSI6
         LNK     s.ScsiFs00

s/ScsiFs05

@@ -15,12 +15,29 @@
 ;>ScsiFs05
 
  [ Dev
+
+        ; Ugly but necessary because debug macros can get called before
+        ; workspace is set up
+        ; Exits NE if IRQsema <> 0
+        MACRO
+        CheckIRQsema
+        Push    "r0-r2,lr"
+        MOV     r0, #6
+        MOV     r1, #0
+        MOV     r2, #OSRSI6_IRQsema
+        SWI     XOS_ReadSysInfo
+        MOVVS   r2, #0
+        CMP     r2, #0
+        LDREQ   r2, =Legacy_IRQsema
+        LDR     r2, [r2]
+        TEQ     r2, #0
+        Pull    "r0-r2,lr"
+        MEND
+
 PHEX
  SavePSR R4
  [ :LNOT: IrqDebug
- MOV    R3, #IRQsema
- LDR    R3, [R3]
- TEQS   R3, #0
+ CheckIRQsema
  BNE    PHEXIT1         ;return if IRQ thread
  ]
  MOV    R3, LR
@@ -87,9 +104,7 @@ Mess1                   ;R0,R1,LR stacked
  SavePSR R0             ;save PSR
  MOV    R1, LR          ;save link
  [ :LNOT: IrqDebug
- MOV    LR, #IRQsema
- LDR    LR, [LR]
- TEQS   LR, #0
+ CheckIRQsema
  MOVNE  PC, R1          ;skip if IRQ thread, return NE
  ]
  BIC    LR, R0, #3