Commits (3)
  • Robert Sprowson's avatar
    Swallow a class of ambiguous disc name errors · 30d277db
    Robert Sprowson authored
    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'
    30d277db
  • Ben Avison's avatar
    Correctly detect errors returned from Service_EnumerateFormats · afacc1f9
    Ben Avison authored
    SWI OS_ServiceCall has never propagated the PSR flags from callees back to
    the caller, so testing the V flag is the wrong way to detect failures. Check
    whether the service call has been claimed instead, since that is documented
    as being part of the process of a callee returning an error.
    
    Version 1.14. Tagged as 'ADFSFiler-1_14'
    afacc1f9
  • Chris Mahoney's avatar
    Added ellipsis after Free · a972c9b4
    Chris Mahoney authored
    As per bug 448, the "Free" menu item on each filer should have an ellipsis because it opens a persistent dialogue box.
    
    Version 1.15. Tagged as 'ADFSFiler-1_15'
    a972c9b4
No preview for this file type
No preview for this file type
No preview for this file type
; ;
; This file is automatically maintained by srccommit, do not edit manually. ; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
; ;
GBLS Module_MajorVersion GBLS Module_MajorVersion
GBLA Module_Version GBLA Module_Version
...@@ -10,14 +9,12 @@ ...@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath Module_MajorVersion SETS "1.15"
Module_MajorVersion SETS "1.12" Module_Version SETA 115
Module_Version SETA 112
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "26 Mar 2017" Module_Date SETS "26 Feb 2020"
Module_ApplicationDate SETS "26-Mar-17" Module_ApplicationDate SETS "26-Feb-20"
Module_ComponentName SETS "ADFSFiler" Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler" Module_FullVersion SETS "1.15"
Module_FullVersion SETS "1.12" Module_HelpVersion SETS "1.15 (26 Feb 2020)"
Module_HelpVersion SETS "1.12 (26 Mar 2017)"
END END
/* (1.12) /* (1.15)
* *
* This file is automatically maintained by srccommit, do not edit manually. * 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.15
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Mar 2017 #define Module_Date_CMHG 26 Feb 2020
#define Module_MajorVersion "1.12" #define Module_MajorVersion "1.15"
#define Module_Version 112 #define Module_Version 115
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "26 Mar 2017" #define Module_Date "26 Feb 2020"
#define Module_ApplicationDate "26-Mar-17" #define Module_ApplicationDate "26-Feb-20"
#define Module_ComponentName "ADFSFiler" #define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.12" #define Module_FullVersion "1.15"
#define Module_HelpVersion "1.12 (26 Mar 2017)" #define Module_HelpVersion "1.15 (26 Feb 2020)"
#define Module_LibraryVersionInfo "1:12" #define Module_LibraryVersionInfo "1:15"
...@@ -627,9 +627,9 @@ PathDefault DCB "Resources:$$.Resources.$FSTitle.Filer." ...@@ -627,9 +627,9 @@ PathDefault DCB "Resources:$$.Resources.$FSTitle.Filer."
[ standalone [ standalone
ResourceFSFiles ResourceFSFiles
[ SDFS [ SDFS
ResourceFile $MergedMsgs, Resources.SDFSFiler.Messages ResourceFile $MergedMsgs, Resources.SDFSFiler.Messages
ResourceFile Resources.SDFS.Sprites, Resources.SDFSFiler.Sprites ResourceFile Resources.SDFS.<UserIF>, Resources.SDFSFiler.Sprites
ResourceFile LocalRes:Templates, Resources.SDFSFiler.Templates ResourceFile LocalRes:Templates, Resources.SDFSFiler.Templates
| |
[ SCSI [ SCSI
ResourceFile $MergedMsgs, Resources.SCSIFiler.Messages ResourceFile $MergedMsgs, Resources.SCSIFiler.Messages
...@@ -2884,7 +2884,8 @@ checkambiguous Entry "r1-r5" ...@@ -2884,7 +2884,8 @@ checkambiguous Entry "r1-r5"
EXIT VC EXIT VC
LDR r14, [r0] ; check error number 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 TEQ r14, r2
EXIT EXIT
...@@ -3870,7 +3871,8 @@ BuildFormatMenu ROUT ...@@ -3870,7 +3871,8 @@ BuildFormatMenu ROUT
MOV r1,#Service_EnumerateFormats MOV r1,#Service_EnumerateFormats
MOV r2,#0 MOV r2,#0
SWI XOS_ServiceCall SWI XOS_ServiceCall
BVS BuildError TEQ r1,#Service_Serviced
BEQ BuildError
STR R2,FormatList STR R2,FormatList
......