Commit 9da5fa02 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Allow background ops again

Adfs20.s:
  Earlier tidy up 3.44->3.45 had erroneously cleared the background transfer bit, so they were being rejected leading to various things hanging while they never completed.
Adfs18.s:
  Safety NOP after mode change before banked register use for consistency with other mode changes in ADFS.
Consts.s/ModHeader.s:
  Documented CMOS bits, use ADFSSWI_Base from Hdr:SWIs, assert local definition matches FileCore.

Floppy *and* harddiscs tested this time.

Version 3.47. Tagged as 'ADFS-3_47'
parent ad1ab43a
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.46"
Module_Version SETA 346
Module_MajorVersion SETS "3.47"
Module_Version SETA 347
Module_MinorVersion SETS ""
Module_Date SETS "21 Oct 2012"
Module_ApplicationDate SETS "21-Oct-12"
Module_Date SETS "23 Oct 2012"
Module_ApplicationDate SETS "23-Oct-12"
Module_ComponentName SETS "ADFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
Module_FullVersion SETS "3.46"
Module_HelpVersion SETS "3.46 (21 Oct 2012)"
Module_FullVersion SETS "3.47"
Module_HelpVersion SETS "3.47 (23 Oct 2012)"
END
/* (3.46)
/* (3.47)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.46
#define Module_MajorVersion_CMHG 3.47
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Oct 2012
#define Module_Date_CMHG 23 Oct 2012
#define Module_MajorVersion "3.46"
#define Module_Version 346
#define Module_MajorVersion "3.47"
#define Module_Version 347
#define Module_MinorVersion ""
#define Module_Date "21 Oct 2012"
#define Module_Date "23 Oct 2012"
#define Module_ApplicationDate "21-Oct-12"
#define Module_ApplicationDate "23-Oct-12"
#define Module_ComponentName "ADFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
#define Module_FullVersion "3.46"
#define Module_HelpVersion "3.46 (21 Oct 2012)"
#define Module_LibraryVersionInfo "3:46"
#define Module_FullVersion "3.47"
#define Module_HelpVersion "3.47 (23 Oct 2012)"
#define Module_LibraryVersionInfo "3:47"
......@@ -1265,8 +1265,8 @@ FlpHandlerData_ExecuteCommand
MSR CPSR_c, r1
ORR r1, r1, #2_10000
MSR CPSR_c, r1
NOP
MOV LR, #FiqVector ; FIQ vector address
; Copy handler
......@@ -3696,6 +3696,7 @@ FlpDqDCB ROUT
BEQ %FT05
Push "r1"
WritePSRc SVC_mode + I_bit,lr,,r1
NOP
Push "r1,lr"
MOV r1, #0
STR r1, FlpMEMCstate
......
......@@ -50,7 +50,7 @@
LowLevelEntry ROUT
CMPS R4, #0 ;IF 0 length
ANDEQ R0, R1, #DiscOp_Op_Mask
BICEQ R0, R1, #DiscOp_Op_Atomic_Flag :OR: DiscOp_Op_ScatterList_Flag :OR: DiscOp_Op_AltDefectList_Flag
ASSERT DiscOp_Verify < DiscOp_ReadTrk
ASSERT DiscOp_ReadSecs < DiscOp_ReadTrk
ASSERT DiscOp_WriteSecs < DiscOp_ReadTrk
......
......@@ -193,7 +193,7 @@ ReadSecsBackOp * DiscOp_ReadTrk
WriteSecsBackOp * &B ;B (only used internally)
]
ASSERT EscapeBit=&40
ASSERT (1:SHL:BackBitNo) = DiscOp_Op_BackgroundOp_Flag
BackBitNo * 8
DiscBits * 2_111 :SHL: (32-3) ;In all disc addresses
......@@ -203,16 +203,11 @@ WinnieService * &10800
; CMOS allocation
; old CMOS byte, StartCMOS in system
;bit 6 is NoDirBit
^ NewADFSCMOS
NewCMOS0 # 1
; b0-b2 # floppies 0 to 4
; b3-b5 # winnies 0 to 2 with this hardware
; b6-b7 unused
; b0-b2 = floppies (0 to 4)
; b3-b5 = ST506 drives winnies (0 to MaxWinnies)
; b6-b7 = IDE drives (0 to WinIDEMaxDrives)
StepDelayCMOS # 1
; bits 2i,2i+1 are step rate bits for floppy i (i=0,1,2,3)
[ FileCache
......@@ -220,6 +215,4 @@ FileCacheCMOS # 1 ;number of additional file cache buffers
]
ASSERT ADFSDirCacheCMOS = &C7
AdfsSwiBase * Module_SWISystemBase + Module_SWIChunkSize * ADFSSWI
END
......@@ -25,7 +25,7 @@ org
& AdfsTitle - org
& AdfsHelpString - org
& ComTab - org
& AdfsSwiBase
& ADFSSWI_Base
& SwiEntry - org
& SwiNames - org
& 0 ;no SWI name decoding 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