Commit 17022331 authored by John Ballance's avatar John Ballance
Browse files

Extended SCSIFS_Partitions SWI reason 1 to be fully aware of partitions

Detail:
  Reason 1 did not check whether the given partition offset matched, so did not
  differentiate between different partitions on a disc
Admin:
  tested on iMx6

Version 1.34. Tagged as 'SCSIFS-1_34'
parent da6e6c3a
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.33"
Module_Version SETA 133
Module_MajorVersion SETS "1.34"
Module_Version SETA 134
Module_MinorVersion SETS ""
Module_Date SETS "13 Jul 2018"
Module_ApplicationDate SETS "13-Jul-18"
Module_Date SETS "16 Jul 2018"
Module_ApplicationDate SETS "16-Jul-18"
Module_ComponentName SETS "SCSIFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
Module_FullVersion SETS "1.33"
Module_HelpVersion SETS "1.33 (13 Jul 2018)"
Module_FullVersion SETS "1.34"
Module_HelpVersion SETS "1.34 (16 Jul 2018)"
END
/* (1.33)
/* (1.34)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.33
#define Module_MajorVersion_CMHG 1.34
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Jul 2018
#define Module_Date_CMHG 16 Jul 2018
#define Module_MajorVersion "1.33"
#define Module_Version 133
#define Module_MajorVersion "1.34"
#define Module_Version 134
#define Module_MinorVersion ""
#define Module_Date "13 Jul 2018"
#define Module_Date "16 Jul 2018"
#define Module_ApplicationDate "13-Jul-18"
#define Module_ApplicationDate "16-Jul-18"
#define Module_ComponentName "SCSIFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
#define Module_FullVersion "1.33"
#define Module_HelpVersion "1.33 (13 Jul 2018)"
#define Module_LibraryVersionInfo "1:33"
#define Module_FullVersion "1.34"
#define Module_HelpVersion "1.34 (16 Jul 2018)"
#define Module_LibraryVersionInfo "1:34"
......@@ -471,17 +471,23 @@ DoSWIPartitions ROUT
1
TEQ R0, #1 ; report icon used
Pull "R1,R2,PC",NE
Push "R3,R4"
Push "R3,R4,R5"
MOV R2, #MaxDriveNo-1
LDR R5, [SP, #4*4] ; retrieve R2 off stack
2
DrvRecPtr R4, R2
LDRB R3, [R4, #:INDEX:DevNo]
TEQ R3, R1
BEQ %ft3
BNE %ft4
ADD LR, SB, R2, LSL #2 ; word offset
LDR LR, [LR, #:INDEX:PartitionBaseAdd-:INDEX:SCSIFSWorkBase] ;
TEQ LR, R5
BEQ %ft3 ; same start sector too
4
SUBS R2,R2,#1
BGE %bt2
3
Pull "R3,R4"
Pull "R3,R4,R5"
STR R2,[R13, #4] ; update R2 return value
Pull "R1,R2,PC"
]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment