Commit fd84951f authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix from Kevin for the verifying of "BigDiscs",erm,so they actually work.

Fix for problem when the disc is so knackered that the transition
between formatting -> verifying failed,used to free the "fm_" block
which on return to the polling routine lead to trying to read a bum
area of memory.

Version 0.93. Tagged as 'ADFSFiler-0_93'
parent 32c1662a
......@@ -28,4 +28,46 @@ RESOURCEEXTRA = resources_templates
include StdTools
include AAsmModule
# Dynamic dependencies:o.Tungsten.ADFSFiler: s.ADFSFiler
o.Tungsten.ADFSFiler: Hdr:ListOpts
o.Tungsten.ADFSFiler: Hdr:Macros
o.Tungsten.ADFSFiler: Hdr:System
o.Tungsten.ADFSFiler: Hdr:SWIs
o.Tungsten.ADFSFiler: Hdr:CPU.Generic26
o.Tungsten.ADFSFiler: Hdr:Machine.<Machine>
o.Tungsten.ADFSFiler: Hdr:Machine.Machine
o.Tungsten.ADFSFiler: Hdr:CPU.Generic32
o.Tungsten.ADFSFiler: Hdr:IO.GenericIO
o.Tungsten.ADFSFiler: Hdr:RISCOS
o.Tungsten.ADFSFiler: Hdr:ModHand
o.Tungsten.ADFSFiler: Hdr:Machine.<Machine>
o.Tungsten.ADFSFiler: Hdr:Machine.Machine
o.Tungsten.ADFSFiler: Hdr:CMOS
o.Tungsten.ADFSFiler: Hdr:FSNumbers
o.Tungsten.ADFSFiler: Hdr:HighFSI
o.Tungsten.ADFSFiler: Hdr:NewErrors
o.Tungsten.ADFSFiler: Hdr:Wimp
o.Tungsten.ADFSFiler: Hdr:WimpSpace
o.Tungsten.ADFSFiler: Hdr:Messages
o.Tungsten.ADFSFiler: Hdr:Sprite
o.Tungsten.ADFSFiler: Hdr:VduExt
o.Tungsten.ADFSFiler: Hdr:Variables
o.Tungsten.ADFSFiler: Hdr:Proc
o.Tungsten.ADFSFiler: Hdr:Services
o.Tungsten.ADFSFiler: Hdr:MsgTrans
o.Tungsten.ADFSFiler: Hdr:MsgMenus
o.Tungsten.ADFSFiler: Hdr:ADFS
o.Tungsten.ADFSFiler: Hdr:Territory
o.Tungsten.ADFSFiler: Hdr:FileCore
o.Tungsten.ADFSFiler: Hdr:MultiFS
o.Tungsten.ADFSFiler: Hdr:UpCall
o.Tungsten.ADFSFiler: Hdr:ResourceFS
o.Tungsten.ADFSFiler: Hdr:ShareD
o.Tungsten.ADFSFiler: Hdr:ExtraLong
o.Tungsten.ADFSFiler: Version
o.Tungsten.ADFSFiler: VersionASM
o.Tungsten.ADFSFiler: Hdr:NdrDebug
o.Tungsten.ADFSFiler: s.Format
o.Tungsten.ADFSFiler: s.Backup
# Dynamic dependencies:
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.92"
Module_Version SETA 92
Module_MajorVersion SETS "0.93"
Module_Version SETA 93
Module_MinorVersion SETS ""
Module_Date SETS "20 Nov 2002"
Module_ApplicationDate SETS "20-Nov-02"
Module_Date SETS "11 Mar 2003"
Module_ApplicationDate SETS "11-Mar-03"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "0.92"
Module_HelpVersion SETS "0.92 (20 Nov 2002)"
Module_FullVersion SETS "0.93"
Module_HelpVersion SETS "0.93 (11 Mar 2003)"
/* (0.92)
/* (0.93)
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
#define Module_MajorVersion_CMHG 0.92
#define Module_MajorVersion_CMHG 0.93
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Nov 2002
#define Module_Date_CMHG 11 Mar 2003
#define Module_MajorVersion "0.92"
#define Module_Version 92
#define Module_MajorVersion "0.93"
#define Module_Version 93
#define Module_MinorVersion ""
#define Module_Date "20 Nov 2002"
#define Module_Date "11 Mar 2003"
#define Module_ApplicationDate "20-Nov-02"
#define Module_ApplicationDate "11-Mar-03"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "0.92"
#define Module_HelpVersion "0.92 (20 Nov 2002)"
#define Module_LibraryVersionInfo "0:92"
#define Module_FullVersion "0.93"
#define Module_HelpVersion "0.93 (11 Mar 2003)"
#define Module_LibraryVersionInfo "0:93"
......@@ -1249,10 +1249,9 @@ Format_GoVerify
MOV r0, #Misc_ReadInfo
SWI XADFS_MiscOp ; returns R0->data block
LDRVCB r0, [r0, #0] ; fetch the bottom byte of the flags
LDRVC r0, [r0, #0] ; fetch the flags
ANDVC r0, r0, #BigDiscSupport ; mask all except the sectorop flag
MOVVS r0, #0 ; if we failed substitute zero
CLRV ; ensure we don't accidentally exit
SUBVSS r0, r0, r0 ; if we failed substitute zero and clear V
STR r0, sectorop ; non-zero if this ADFS is SectorOp capable
Debug ag,"Set sectorop flag to",r0
......@@ -1416,9 +1415,9 @@ StartVerify
Pull "r1",VS ; may get an error if the defect list built from map data
Pull "r1",VS ; exceeds our space
MOVVS r2, r8
BVS format_verify_error_delete_window
Pull "r1,PC",VS ; exceeds our space or the disc is so knackered the
; call fails with a "disc not formatted" error!
; As the window is open just return to the NullEvent hander
; if it was the new style call, I need to terminate it for use here
; (the new call also modifies R1 to return the number of pairs)
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