Commit 138040d0 authored by Ben Avison's avatar Ben Avison
Browse files

Minor bugfix to MiscOp 1 for '765 floppy disc driver

Detail:
  If the sequence number did not have the expected value on entry (i.e. the
  caller had missed at least one state change) then the driver always reported
  Changed, even for floppy drives without a working disc changed line. This
  was the only time when Changed was reported for such drives - now it reports
  MaybeChanged in this case, which is consistent with the 1772 floppy driver.
  Also removed the confusingly-named (and unused) symbols DefectStruc and
  DefectCheck, in line with similar changes to SCSIFS and FileCore.
Admin:
  Untested, but should be a safe change.

Version 3.44. Tagged as 'ADFS-3_44'
parent 61dadf8c
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.43"
Module_Version SETA 343
Module_MajorVersion SETS "3.44"
Module_Version SETA 344
Module_MinorVersion SETS ""
Module_Date SETS "21 Mar 2012"
Module_ApplicationDate SETS "21-Mar-12"
Module_Date SETS "14 Apr 2012"
Module_ApplicationDate SETS "14-Apr-12"
Module_ComponentName SETS "ADFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
Module_FullVersion SETS "3.43"
Module_HelpVersion SETS "3.43 (21 Mar 2012)"
Module_FullVersion SETS "3.44"
Module_HelpVersion SETS "3.44 (14 Apr 2012)"
END
/* (3.43)
/* (3.44)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.43
#define Module_MajorVersion_CMHG 3.44
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Mar 2012
#define Module_Date_CMHG 14 Apr 2012
#define Module_MajorVersion "3.43"
#define Module_Version 343
#define Module_MajorVersion "3.44"
#define Module_Version 344
#define Module_MinorVersion ""
#define Module_Date "21 Mar 2012"
#define Module_Date "14 Apr 2012"
#define Module_ApplicationDate "21-Mar-12"
#define Module_ApplicationDate "14-Apr-12"
#define Module_ComponentName "ADFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
#define Module_FullVersion "3.43"
#define Module_HelpVersion "3.43 (21 Mar 2012)"
#define Module_LibraryVersionInfo "3:43"
#define Module_FullVersion "3.44"
#define Module_HelpVersion "3.44 (14 Apr 2012)"
#define Module_LibraryVersionInfo "3:44"
......@@ -288,9 +288,6 @@ MaxStruc * 64
^ 0
# SzDefectList-MaxStruc-4
ParkDiscAdd # 4
DefectStruc # MaxStruc-1
DefectCheck # 1
ASSERT @=SzDefectList
NameLen * 10
......
......@@ -2304,11 +2304,16 @@ DoPollChanged ROUT
LDR R0, [R4, #DrvSequenceNum]
TEQS R0, R2 ; Sequence same?
MOVNE R2, R0 ; No, use new seq. number
LDRNE R3, [R4, #DrvFlags] ; And get drive flags
BICNE R3, R3, #MiscOp_PollChanged_Empty_Flag+MiscOp_PollChanged_MaybeChanged_Flag+MiscOp_PollChanged_NotChanged_Flag
BEQ %FT05 ; Yes
MOV R2, R0 ; No, use new seq. number
LDR R3, [R4, #DrvFlags] ; And get drive flags
BIC R3, R3, #MiscOp_PollChanged_Empty_Flag+MiscOp_PollChanged_MaybeChanged_Flag+MiscOp_PollChanged_NotChanged_Flag
TST R3, #MiscOp_PollChanged_ChangedWorks_Flag
ORRNE R3, R3, #MiscOp_PollChanged_Changed_Flag ; And set changed
BNE %FT30 ; And jump
ORREQ R3, R3, #MiscOp_PollChanged_MaybeChanged_Flag
B %FT30 ; And jump
05
; Quick exit if drive busy
......
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