Commit 30d277db authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL

Swallow a class of ambiguous disc name errors

When the dreaded ambiguous disc name error occurs ADFSFiler has logic to suppress the error and proceed when possible. However the check was against specifically FS number 8 (ADFS), SDFS and SCSIFS didn't benefit.
Now, matching on any FS number, it is possible to toggle between 2 (eg.) SD cards of the same name just as you can 2 ADFS floppies.

Also, fix the SDFS standalone build to pick up the Sprites file from the UserIF.

Version 1.13. Tagged as 'ADFSFiler-1_13'
parent fc930421
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.12"
Module_Version SETA 112
Module_MajorVersion SETS "1.13"
Module_Version SETA 113
Module_MinorVersion SETS ""
Module_Date SETS "26 Mar 2017"
Module_ApplicationDate SETS "26-Mar-17"
Module_Date SETS "22 Aug 2019"
Module_ApplicationDate SETS "22-Aug-19"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "1.12"
Module_HelpVersion SETS "1.12 (26 Mar 2017)"
Module_FullVersion SETS "1.13"
Module_HelpVersion SETS "1.13 (22 Aug 2019)"
END
/* (1.12)
/* (1.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.12
#define Module_MajorVersion_CMHG 1.13
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Mar 2017
#define Module_Date_CMHG 22 Aug 2019
#define Module_MajorVersion "1.12"
#define Module_Version 112
#define Module_MajorVersion "1.13"
#define Module_Version 113
#define Module_MinorVersion ""
#define Module_Date "26 Mar 2017"
#define Module_Date "22 Aug 2019"
#define Module_ApplicationDate "26-Mar-17"
#define Module_ApplicationDate "22-Aug-19"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.12"
#define Module_HelpVersion "1.12 (26 Mar 2017)"
#define Module_LibraryVersionInfo "1:12"
#define Module_FullVersion "1.13"
#define Module_HelpVersion "1.13 (22 Aug 2019)"
#define Module_LibraryVersionInfo "1:13"
......@@ -627,9 +627,9 @@ PathDefault DCB "Resources:$$.Resources.$FSTitle.Filer."
[ standalone
ResourceFSFiles
[ SDFS
ResourceFile $MergedMsgs, Resources.SDFSFiler.Messages
ResourceFile Resources.SDFS.Sprites, Resources.SDFSFiler.Sprites
ResourceFile LocalRes:Templates, Resources.SDFSFiler.Templates
ResourceFile $MergedMsgs, Resources.SDFSFiler.Messages
ResourceFile Resources.SDFS.<UserIF>, Resources.SDFSFiler.Sprites
ResourceFile LocalRes:Templates, Resources.SDFSFiler.Templates
|
[ SCSI
ResourceFile $MergedMsgs, Resources.SCSIFiler.Messages
......@@ -2884,7 +2884,8 @@ checkambiguous Entry "r1-r5"
EXIT VC
LDR r14, [r0] ; check error number
LDR r2, =&1089E ; "ambiguous disc name"
BIC r14, r14, #&FF00 ; match on any FS number
LDR r2, =&1009E ; FileCore FS "ambiguous disc name"
TEQ r14, r2
EXIT
......
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