Commit 4db081c1 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Update to use some of the exported FileCore headers.

There are still a large number of local copies that should be visited, but this change at least allows it to assemble again FileCore-3_45.

Version 1.22. Tagged as 'SCSIFS-1_22'
parent 8c298058
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.21"
Module_Version SETA 121
Module_MajorVersion SETS "1.22"
Module_Version SETA 122
Module_MinorVersion SETS ""
Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "04-Aug-11"
Module_Date SETS "14 Oct 2011"
Module_ApplicationDate SETS "14-Oct-11"
Module_ComponentName SETS "SCSIFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
Module_FullVersion SETS "1.21"
Module_HelpVersion SETS "1.21 (04 Aug 2011)"
Module_FullVersion SETS "1.22"
Module_HelpVersion SETS "1.22 (14 Oct 2011)"
END
/* (1.21)
/* (1.22)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.21
#define Module_MajorVersion_CMHG 1.22
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Aug 2011
#define Module_Date_CMHG 14 Oct 2011
#define Module_MajorVersion "1.21"
#define Module_Version 121
#define Module_MajorVersion "1.22"
#define Module_Version 122
#define Module_MinorVersion ""
#define Module_Date "04 Aug 2011"
#define Module_Date "14 Oct 2011"
#define Module_ApplicationDate "04-Aug-11"
#define Module_ApplicationDate "14-Oct-11"
#define Module_ComponentName "SCSIFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
#define Module_FullVersion "1.21"
#define Module_HelpVersion "1.21 (04 Aug 2011)"
#define Module_LibraryVersionInfo "1:21"
#define Module_FullVersion "1.22"
#define Module_HelpVersion "1.22 (14 Oct 2011)"
#define Module_LibraryVersionInfo "1:22"
......@@ -172,15 +172,15 @@ PsrMask * &FC000003
NZCV * N_bit :OR: Z_bit :OR: C_bit :OR: V_bit
[ BigDisc
BigBit * BigDiscSupport
NewErrorBit * NewErrorSupport
BigBit * CreateFlag_BigDiscSupport
NewErrorBit * CreateFlag_NewErrorSupport
|
BigBit * 0
NewErrorBit * 0
]
[ Ejecting
EjectBit * FloppiesEject
EjectBit * CreateFlag_FloppyEjects
|
EjectBit * 0
]
......@@ -357,8 +357,8 @@ LostUnitAtn bit 0
;ResetChangedByStep bit 3
;ResetChangedByWrite bit 4
;QuadDrv bit 5 ;set if quad
ASSERT Drv_EmptyWorks = bit6
ASSERT Drv_ChangedWorks = bit7
ASSERT MiscOp_PollChanged_EmptyWorks_Flag = bit6
ASSERT MiscOp_PollChanged_ChangedWorks_Flag = bit7
DevNo # 3
;HeadPosition # 4
......
......@@ -58,7 +58,10 @@ LowLevelOp2 ;another internal entry point
CMPS R4, #0 ;IF 0 length
BICEQ R7, R1, #NoTimeOut :OR: NoEscape :OR: ScatterBit :OR: AltDefectBit
CMPEQS R7, #Param3Op ;AND verify, read/write secs, not background
ASSERT DiscOp_Verify < DiscOp_ReadTrk
ASSERT DiscOp_ReadSecs < DiscOp_ReadTrk
ASSERT DiscOp_WriteSecs < DiscOp_ReadTrk
CMPEQS R7, #DiscOp_ReadTrk ;AND verify, read/write secs, not background
Pull "R0-R8,R9,PC",LO ;THEN nothing to do
[ FloppySupport
......@@ -90,7 +93,7 @@ LowLevelOp2 ;another internal entry point
LDR R7, FCFeatures
]
ANDS R5, R1, #OpMask
CMPS R5, #RestoreOp+1 ;moan if bad reason code
CMPS R5, #DiscOp_Restore+1 ;moan if bad reason code
; LDRCCB R0, Winnies
;>>> RSBCCS R0, R0, R2, LSR #29 ; or if bad drive
[ FloppySupport
......@@ -104,7 +107,11 @@ LowLevelOp2 ;another internal entry point
mapDrvToDevLo R0, R0 ;map drive onto device
AND LR, R1, #ScatterBit :OR: NoEscape :OR: NoTimeOut :OR: BackgroundOp
ORR R0, R0, LR, LSL #CTL_cnvt
CMPS R5, #Param1Op
ASSERT DiscOp_StepIn > DiscOp_Restore
ASSERT DiscOp_StepOut > DiscOp_Restore
ASSERT DiscOp_CachedReadSecs > DiscOp_Restore
ASSERT DiscOp_Specify > DiscOp_Restore
CMPS R5, #DiscOp_Restore
BHS %FT20
;convert byte disc address to block address
BIC LR, R2, #DiscBits
......@@ -602,17 +609,17 @@ DoPollChanged ROUT
; Hard drive case - only for hotplugging, really.
mapDrvToDevLo LR, R1, R4
CMP LR, #-1
MOVEQ R3, #Drv_Empty
MOVEQ R3, #MiscOp_PollChanged_Empty_Flag
BEQ %FT04
TSTS R5, #LostUnitAtn
TEQEQS R2, R6
MOVEQ R3, #Drv_NotChanged
MOVNE R3, #Drv_Changed
MOVEQ R3, #MiscOp_PollChanged_NotChanged_Flag
MOVNE R3, #MiscOp_PollChanged_Changed_Flag
04
TST R3, #Drv_NotChanged
TST R3, #MiscOp_PollChanged_NotChanged_Flag
ADDEQ R2, R6, #1
STREQ R2, [R4,#DrvSequenceNum]
ORR R3, R3, #Drv_ChangedWorks :OR: Drv_EmptyWorks
ORR R3, R3, #MiscOp_PollChanged_ChangedWorks_Flag :OR: MiscOp_PollChanged_EmptyWorks_Flag
Pull "R0,R1,R4-R9,PC"
......@@ -627,9 +634,9 @@ DoPollChanged ROUT
08
;here if not changed
MOV R3, #Drv_Changed+Drv_Ready
MOV R3, #MiscOp_PollChanged_Changed_Flag+MiscOp_PollChanged_Ready_Flag
TEQS R2, R6
MOVEQ R3, #Drv_NotChanged+Drv_Ready
MOVEQ R3, #MiscOp_PollChanged_NotChanged_Flag+MiscOp_PollChanged_Ready_Flag
MOV R2, R6 ;Returned as the new drive sequence number
B %FT20
......@@ -643,8 +650,8 @@ DoPollChanged ROUT
STRNEB R0, [R4,#DrvFlags]
;18
MOVEQ R3, #Drv_Changed+Drv_Ready
MOVNE R3, #Drv_Empty
MOVEQ R3, #MiscOp_PollChanged_Changed_Flag+MiscOp_PollChanged_Ready_Flag
MOVNE R3, #MiscOp_PollChanged_Empty_Flag
20
[ Debug4
......@@ -656,7 +663,7 @@ DoPollChanged ROUT
mess EQ,"*Changed" ,NL
mess GT,"*Empty" ,NL
]
ORR R3, R3, #Drv_ChangedWorks :OR: Drv_EmptyWorks :OR: Drv_ReadyWorks
ORR R3, R3, #MiscOp_PollChanged_ChangedWorks_Flag :OR: MiscOp_PollChanged_EmptyWorks_Flag :OR: MiscOp_PollChanged_ReadyWorks_Flag
Pull "R0,R1,R4-R9,PC"
;
......
......@@ -16,7 +16,7 @@
MACRO
Misc $str
ASSERT Misc_$str=(.-MiscTable) :SHR: 2
ASSERT MiscOp_$str=(.-MiscTable) :SHR: 2
B Do$str
MEND
......@@ -37,7 +37,7 @@ MiscEntry ROUT
]
Push "LR"
getSB
CMPS R0, #Misc_DriveStatus
CMPS R0, #MiscOp_DriveStatus
BHI %FT95
MOV LR, PC
......@@ -131,7 +131,7 @@ DoMount ROUT
ORR R2, LR, R2, LSR R8
]
MOV R6, #NIL ;no defect list - empty for SCSI discs anyway
MOV R1, #ReadSecsOp :OR: NoEscape
MOV R1, #DiscOp_ReadSecs :OR: DiscOp_Op_IgnoreEscape_Flag
CMP R4, #0
BLNE LowLevelOp ;(R1-R6->R0-R4,V)
[ Debug4
......@@ -160,7 +160,7 @@ DoMount ROUT
]
MOV R3, #ScratchSpace
MOV R4, #SzDefectList
MOV R1, #ReadSecsOp :OR: NoEscape
MOV R1, #DiscOp_ReadSecs :OR: DiscOp_Op_IgnoreEscape_Flag
MOV R6, #NIL ;no defect list - empty for SCSI discs anyway
BL LowLevelOp ;(R1-R6->R0-R4,V)
BVS %BT95
......
......@@ -17,8 +17,8 @@
TTL "Initialisation and FS star commands"
FSCreateBlock
= EjectBit+WinniePollChanges
= (DriveStatusWorks:SHR:8)+(BigBit:SHR:8)+(NewErrorBit:SHR:8)
= EjectBit+CreateFlag_FixedDiscPollChangeSupport
= (CreateFlag_DriveStatusWorks:SHR:8)+(BigBit:SHR:8)+(NewErrorBit:SHR:8)
= 0,fsnumber_SCSIFS
& CreateTitle ;>>>RCM was ScsiFsTitle
& ScsiFsBootText
......@@ -127,7 +127,7 @@ InitEntry ROUT ; NO REENTRANCY CHECK NEEDED
|
MOV R3, R5, LSL #16
]
ORR R3,R3,#&40000000 ;>>>RCM see what happens
ORR R3,R3,#DriveConfig_StartupOpt_NoDir ;>>>RCM see what happens
[ LeftToDo
! 0, "Left to do - think about Dir/NoDir bit"
; Should we Set it, Clear it or read it from CMOS???
......
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