small number of changes to correctly work with scatterlists such used by filecore format discs.

Detail: these should have been committed as part of the mods of 5th March
	though it appears the something was missed as recent checkouts didn't
	contain all the mods.
Admin:  castle added IP


Version 1.15. Tagged as 'SCSIFS-1_15'

MkSA,fd7

+| Copyright 2005 Castle Technology Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+Dir <Obey$Dir>
+amu_machine standalone

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.14"
-Module_Version          SETA    114
+Module_MajorVersion     SETS    "1.15"
+Module_Version          SETA    115
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "05 Mar 2005"
-Module_ApplicationDate  SETS    "05-Mar-05"
+Module_Date             SETS    "28 Apr 2005"
+Module_ApplicationDate  SETS    "28-Apr-05"
 Module_ComponentName    SETS    "SCSIFS"
 Module_ComponentPath    SETS    "RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
-Module_FullVersion      SETS    "1.14"
-Module_HelpVersion      SETS    "1.14 (05 Mar 2005)"
+Module_FullVersion      SETS    "1.15"
+Module_HelpVersion      SETS    "1.15 (28 Apr 2005)"
                         END

VersionNum

-/* (1.14)
+/* (1.15)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.2.
  *
  */
-#define Module_MajorVersion_CMHG        1.14
+#define Module_MajorVersion_CMHG        1.15
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                05 Mar 2005
+#define Module_Date_CMHG                28 Apr 2005
 
-#define Module_MajorVersion             "1.14"
-#define Module_Version                  114
+#define Module_MajorVersion             "1.15"
+#define Module_Version                  115
 #define Module_MinorVersion             ""
-#define Module_Date                     "05 Mar 2005"
+#define Module_Date                     "28 Apr 2005"
 
-#define Module_ApplicationDate          "05-Mar-05"
+#define Module_ApplicationDate          "28-Apr-05"
 
 #define Module_ComponentName            "SCSIFS"
 #define Module_ComponentPath            "RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
 
-#define Module_FullVersion              "1.14"
-#define Module_HelpVersion              "1.14 (05 Mar 2005)"
-#define Module_LibraryVersionInfo       "1:14"
+#define Module_FullVersion              "1.15"
+#define Module_HelpVersion              "1.15 (28 Apr 2005)"
+#define Module_LibraryVersionInfo       "1:15"

s/ScsiFs15

@@ -40,7 +40,6 @@ LowLevelOp              ;internal entry point
  wrhex  R4
  wrhex  R5
  wrhex  R6
- wrhex  R13
  mess   ,"*>LowLevel",NL
  ]
 
@@ -99,19 +98,11 @@ LowLevelOp              ;internal entry point
  BCS    BadParameters
 
  MOV    R0, R2, LSR #29
- [ Debug3
- wrhex  R0
- wrhex  R1
- mess , "xx1 ", NL
- ]
+
+
  mapDrvToDevLo R0, R0           ;map drive onto device
  AND    LR, R1, #ScatterBit :OR: NoEscape :OR: NoTimeOut :OR: BackgroundOp
  ORR    R0, R0, LR, LSL #CTL_cnvt
- [ Debug3
- wrhex  R0
- wrhex  R1
- mess , "xx2 ", NL
- ]
  CMPS   R5, #Param1Op
  BHS    %FT20
                                 ;convert byte disc address to block address
@@ -226,19 +217,6 @@ RestoreCase
 ;
 
 OpCommon
-; [ CheckSpareRMA
-; STMFD  R13!,{R0-R3}
-; MOV    R0, #5                          ; return total free space
-; SWI    XOS_Module
-; BVS    %ft11                           ; failed to read size
-; CMP    R3, #ExtraRMA                   ; at least xxx free?
-;                                        ; no
-; RSBLT  R1, R3, #ExtraRMA               ; extra we need
-; MOVLT  R0, #1                          ; RMA space
-; SWILT  XOS_ChangeDynamicArea           ; try to change it
-;11
-; LDMFD  R13!, {R0-R3}                   ; recover regs
-; ]
  MOV    R5, #0                          ;Default timeout
  [ UseSpecialScatterBlk
  STR    R5, ScatterFlag                 ;Default: dont use scatter method
@@ -265,11 +243,6 @@ OpCommon
  AND R9, R0, #CTL_TXWRITE :OR: CTL_TXREAD
  CMP R9, #CTL_TXWRITE
  BNE DontNeedScatBlk                    ;If we arent writing fine ...
- [ Debug3
-   wrhex r0
-   mess , "op entry1 "
- ]
-
  TST R0, #CTL_SCATTER
  [ Debug3                               ;Oh dear already using a scatter pointer ...
  BEQ NotAppropriate1
@@ -369,16 +342,6 @@ DontNeedScatBlk
  MOV    R9,#60                          ;Retry on timeout for 60 seconds
 30
  Push   "R0-R4"                         ;Stack incase we need to retry
- [ Debug3
- wrhex  R0
- wrhex  R1
- wrhex  R2
- wrhex  R3
- wrhex  R4
- wrhex  R5
- wrhex  R6
- mess   , "DoSCSIOp", NL
- ]
  DoSCSIOp
  [ IgnoreRecoveredError
  BLVS   CheckRecovered                  ;If error is 'Recovered error' clear
@@ -428,7 +391,6 @@ LowError
  wrhex  R2
  wrhex  R3
  wrhex  R4
- wrhex  R13
  mess   ,"*<LowLevel",NL,NL
  ]
 DoNOP

s/ScsiFs20

@@ -112,24 +112,6 @@ DoMount ROUT
  Pull   "R1-R4,R6-R8,PC",VS
 05
  ]
-; [ T
-; mov    R0, #5                  ; return total free space
-; SWI    XOS_Module
-; BVS    %ft11                   ; failed to read size
-; CMP    R3, #1024*1024           ; at least 128k free?
-; BGT    %ft11                   ; yes
-;                                ; no
-; RSB    R2, R3, #1024*1024       ; extra we need
-; MOV    R1, R2
-; MOV    R0, #1                  ; RMA space
-; SWI    XOS_ChangeDynamicArea   ; try to change it
-; CMP    R1, R2
-; BGE    %ft11
-; Pull   "R1-R4,R6-R8,PC"
-;
-;11
-; LDMFD  R13, {R1-R3}            ; copy back regs
-; ]
  [ AllowPartitions
  Push   "R0, R1,R2"
  MOV    R2, R2, LSR #(32-3)     ; disc number requested

s/ScsiFs50

@@ -433,7 +433,7 @@ DoSWIPartitions ROUT
  Pull   "R1,R2,PC", HI
  ADD    LR, SB, R1, LSL #2  ; word offset
  STR    R2, [LR, #:INDEX:PartitionBaseAdd-:INDEX:SCSIFSWorkBase] ; remember
- Pull   "R1,R2,PC"
+  Pull   "R1,R2,PC"
 1
  TEQ    R0, #1              ; report icon used
  Pull   "R1,R2,PC",NE