Commit bddd3821 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix ADFSFiler/SCSIFiler to refuse to start their WIMP task if ADFS/SCSI module is missing

Detail:
  s/ADFSFiler - For as long as CVS history has recorded, SetUpIconBar has always had the behaviour of exiting with EXITS if the first ADFS/SCSI SWI call fails. This was causing the calling code to think that everything was fine, when really the module should have reported the error to the user/system. This has no been fixed, so attempting to start ADFSFiler/SCSIFiler without the underlying FS module being available now results in an error message.
Admin:
  Tested on rev C2 beagleboard (ADFSFiler+SCSIFiler in ROM), plus with ADFSFiler softload on Iyonix.


Version 1.01. Tagged as 'ADFSFiler-1_01'
parent 73330723
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.00"
Module_Version SETA 100
Module_MajorVersion SETS "1.01"
Module_Version SETA 101
Module_MinorVersion SETS ""
Module_Date SETS "01 Mar 2010"
Module_ApplicationDate SETS "01-Mar-10"
Module_Date SETS "02 Mar 2010"
Module_ApplicationDate SETS "02-Mar-10"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "1.00"
Module_HelpVersion SETS "1.00 (01 Mar 2010)"
Module_FullVersion SETS "1.01"
Module_HelpVersion SETS "1.01 (02 Mar 2010)"
END
/* (1.00)
/* (1.01)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.00
#define Module_MajorVersion_CMHG 1.01
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Mar 2010
#define Module_Date_CMHG 02 Mar 2010
#define Module_MajorVersion "1.00"
#define Module_Version 100
#define Module_MajorVersion "1.01"
#define Module_Version 101
#define Module_MinorVersion ""
#define Module_Date "01 Mar 2010"
#define Module_Date "02 Mar 2010"
#define Module_ApplicationDate "01-Mar-10"
#define Module_ApplicationDate "02-Mar-10"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.00"
#define Module_HelpVersion "1.00 (01 Mar 2010)"
#define Module_LibraryVersionInfo "1:0"
#define Module_FullVersion "1.01"
#define Module_HelpVersion "1.01 (02 Mar 2010)"
#define Module_LibraryVersionInfo "1:1"
......@@ -3031,14 +3031,14 @@ ic_floppy3 IconDef "floppydisc", ":3", "$"
ALIGN
SetUpIconBar EntryS
SetUpIconBar Entry
[ SCSI
SWI XSCSIFS_Drives
|
SWI XADFS_Drives
]
EXITS VS ; r2 := no of winnies
EXIT VS ; r2 := no of winnies
MOV r3, r1 ; r3 := no of floppies
[ :LNOT: HotPlug
STR r3,nfloppies ; used by *Backup code
......
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