Commit b6000af1 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.03. Tagged as 'ADFSFiler-1_03'
parent 7dbecd87
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.02"
Module_Version SETA 102
Module_MajorVersion SETS "1.03"
Module_Version SETA 103
Module_MinorVersion SETS ""
Module_Date SETS "22 Sep 2011"
Module_ApplicationDate SETS "22-Sep-11"
Module_Date SETS "14 Oct 2011"
Module_ApplicationDate SETS "14-Oct-11"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "1.02"
Module_HelpVersion SETS "1.02 (22 Sep 2011)"
Module_FullVersion SETS "1.03"
Module_HelpVersion SETS "1.03 (14 Oct 2011)"
END
/* (1.02)
/* (1.03)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.02
#define Module_MajorVersion_CMHG 1.03
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Sep 2011
#define Module_Date_CMHG 14 Oct 2011
#define Module_MajorVersion "1.02"
#define Module_Version 102
#define Module_MajorVersion "1.03"
#define Module_Version 103
#define Module_MinorVersion ""
#define Module_Date "22 Sep 2011"
#define Module_Date "14 Oct 2011"
#define Module_ApplicationDate "22-Sep-11"
#define Module_ApplicationDate "14-Oct-11"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.02"
#define Module_HelpVersion "1.02 (22 Sep 2011)"
#define Module_LibraryVersionInfo "1:2"
#define Module_FullVersion "1.03"
#define Module_HelpVersion "1.03 (14 Oct 2011)"
#define Module_LibraryVersionInfo "1:3"
......@@ -1982,7 +1982,7 @@ go_fl_dismount
LDRVCB r1, driveno+1
SUBVC r1, r1, #"0"
MOVVC r0, #Misc_Eject
MOVVC r0, #MiscOp_Eject
[ SCSI
SWIVC XSCSIFS_MiscOp
|
......
......@@ -1070,7 +1070,7 @@ FirstWrite
BVS FirstWriteFailed
LDR lr, [r2]
TEQ lr, #&20000000
TEQ lr, #DefectList_End
BNE DestHasDefects
]
......
......@@ -873,11 +873,11 @@ StartFormat ROUT
STRB r3, [r4, #DoFormatOptions]
LDRB r3, [r0, #FormatFillValue]
STRB r3, [r4, #DoFormatFillValue]
LDR r3, [r0, #TracksToFormat]
LDR r3, [r0, #FormatTracksToFormat]
LDRB r5, [r0, #FormatOptions]
AND r5, r5, #3 :SHL: 2
TEQ r5, #FormatInterleaveSides
TEQNE r5, #FormatSequenceSides
AND r5, r5, #FormatOptSidesMask
TEQ r5, #FormatOptInterleaveSides
TEQNE r5, #FormatOptSequenceSides
MOVEQ r3, r3, LSR #1
STR r3, [r4, #DoFormatCylindersPerDrive]
MOV r3, #0
......@@ -898,7 +898,7 @@ StartFormat ROUT
STRB r3, [r2, #SecsPerTrk]
; Heads is 2 for interleave sides variety only
TEQ r5, #FormatInterleaveSides
TEQ r5, #FormatOptInterleaveSides
MOVEQ r3, #2
MOVNE r3, #1
STRB r3, [r2, #Heads]
......@@ -917,7 +917,7 @@ StartFormat ROUT
LDRB r3, [r0, #FormatLowSector]
ORRNE r3, r3, #bit6
LDRB lr, [r0, #FormatOptions]
TST lr, #FormatDoubleStep
TST lr, #FormatOptDoubleStep
ORRNE r3, r3, #bit7
STRB r3, [r2, #LowSector]
......@@ -928,12 +928,12 @@ StartFormat ROUT
LDRB r3, [r2, #SecsPerTrk]
LDRB lr, [r2, #SectorSize]
MOV r3, r3, ASL lr
LDR lr, [r0, #TracksToFormat]
LDR lr, [r0, #FormatTracksToFormat]
MUL r3, lr, r3
; If Side0 or Side1 only then double to get the disc size
TEQ r5, #FormatSide0Only
TEQNE r5, #FormatSide1Only
TEQ r5, #FormatOptSide0Only
TEQNE r5, #FormatOptSide1Only
ADDEQ r3, r3, r3
STR r3, [r2, #DiscSize]
......@@ -1050,7 +1050,7 @@ FormatTrack ROUT
LDR r11,[r0,#20]
LDR r0,[r0,#24]
MOV r1,#&20000000
MOV r1,#DefectList_End
STR r1,[r8,#fw_defectlist]
ADD r1,r8,#fw_defectlist
MOV r2,r5
......@@ -1100,16 +1100,16 @@ ConstructDoFormatIdList ROUT
; Get the format sides option
LDRB r5, [r0, #FormatOptions]
AND r5, r5, #3 :SHL: 2
AND r5, r5, #FormatOptSidesMask
; Construct cylinder MOD 256
LDR lr, [r0, #TracksToFormat]
TEQ r5, #FormatInterleaveSides
LDR lr, [r0, #FormatTracksToFormat]
TEQ r5, #FormatOptInterleaveSides
MOVEQ r3, r1, LSR #1
TEQ r5, #FormatSide0Only
TEQNE r5, #FormatSide1Only
TEQ r5, #FormatOptSide0Only
TEQNE r5, #FormatOptSide1Only
MOVEQ r3, r1
TEQ r5, #FormatSequenceSides
TEQ r5, #FormatOptSequenceSides
BNE %FT10
CMP r1, lr, LSR #1
MOVLO r3, r1
......@@ -1118,14 +1118,14 @@ ConstructDoFormatIdList ROUT
AND r3, r3, #&ff
; Construct head
TEQ r5, #FormatInterleaveSides
TEQ r5, #FormatOptInterleaveSides
ANDEQ lr, r1, #1
ORREQ r3, r3, lr, ASL #8
; TEQ r5, #FormatSide0Only
; <do nothing - side = 0>
TEQ r5, #FormatSide1Only
TEQ r5, #FormatOptSide1Only
ORREQ r3, r3, #1 :SHL: 8
TEQ r5, #FormatSequenceSides
TEQ r5, #FormatOptSequenceSides
BNE %FT20
CMP r1, lr, LSR #1
ORRHS r3, r3, #1 :SHL: 8
......@@ -1169,7 +1169,7 @@ ConstructDoFormatIdList ROUT
MUL r7, r6, r7 ; Skew for tracks
; Add track track skew if on head 1 on an interleaved sided disc
TEQ r5, #FormatInterleaveSides
TEQ r5, #FormatOptInterleaveSides
LDREQB lr, [r2, #1] ; head
TEQEQ lr, #1
LDREQB lr, [r0, #FormatSideSideSkew]
......@@ -1233,10 +1233,10 @@ ConstructDoFormatIdList ROUT
LDR lr, [r0, #FormatSectorSize]
LDRB r2, [r0, #FormatSectorsPerTrk]
MUL r2, lr, r2 ; Bytes per track
LDR lr, [r0, #TracksToFormat]
LDR lr, [r0, #FormatTracksToFormat]
LDRB r5, [r0, #FormatOptions]
AND r5, r5, #3 :SHL: 2
TEQ r5, #FormatSide1Only
AND r5, r5, #FormatOptSidesMask
TEQ r5, #FormatOptSide1Only
ADDEQ r1, r1, lr ; Track as understood by DiscOp
MUL r2, r1, r2 ; Byte offset of start of track
......@@ -1256,15 +1256,15 @@ Format_GoVerify
;byte addressing when it isn't. At some point in the future the routines
;specific to byte addressing should be removed.
MOV r0, #Misc_ReadInfo
MOV r0, #MiscOp_ReadInfo
[ SCSI
SWI XSCSIFS_MiscOp ; returns R0->data block
|
SWI XADFS_MiscOp ; returns R0->data block
]
LDRVC r0, [r0, #0] ; fetch the flags
ANDVC r0, r0, #BigDiscSupport ; mask all except the sectorop flag
LDRVC r0, [r0, #Create_Flags] ; fetch the flags
ANDVC r0, r0, #CreateFlag_BigDiscSupport
SUBVSS r0, r0, r0 ; if we failed substitute zero and clear V
STR r0, sectorop ; non-zero if this ADFS is SectorOp capable
......@@ -1410,7 +1410,7 @@ StartVerify
MOV r5,#512 ; buffer is actually 520 long, but
; the last 8 are for the terminator
LDR r0,sectorop
CMP r0,#BigDiscSupport
CMP r0,#CreateFlag_BigDiscSupport
MOVNE r0,#41 ; read defect list as single words
MOVEQ r0,#56 ; read defect list as word pairs
......@@ -1436,10 +1436,10 @@ StartVerify
; (the new call also modifies R1 to return the number of pairs)
LDR r0,sectorop
CMP r0,#BigDiscSupport
CMP r0,#CreateFlag_BigDiscSupport
MOVEQ r1,r1,LSL #3 ; change number of pairs into number of bytes
MOVEQ lr,#&20000000
MOVEQ lr,#DefectList_End
STREQ lr,[r2,r1] ; store terminator in first word
ADDEQ r1,r1,#4
STREQ lr,[r2,r1] ; and in second word
......@@ -1533,7 +1533,7 @@ VerifyTrack
]
BEQ %FT80
LDR r0,sectorop
CMP r0,#BigDiscSupport
CMP r0,#CreateFlag_BigDiscSupport
BEQ %FT78
[ SCSI
SWI XSCSIFS_DiscOp ; call DiscOp or SectorDiscOp depending on the ADFS type
......@@ -1660,7 +1660,7 @@ NextVerify
ADD r3,r8,#fw_defectlist
21
LDR r0,sectorop
CMP r0,#BigDiscSupport
CMP r0,#CreateFlag_BigDiscSupport
BNE %FT22
23
......@@ -1669,8 +1669,8 @@ NextVerify
]
LDR r2,[r3],#4 ; fetch the low word of the defect list
LDR r0,[r3],#4 ; and the high word
TEQ r2,#&20000000 ; check the low word for the magic value
TEQEQ r0,#&20000000 ; and the high word
TEQ r2,#DefectList_End ; check the low word for the magic value
TEQEQ r0,#DefectList_End ; and the high word
Pull "r0-r3",EQ
BEQ %FT30
......@@ -1691,7 +1691,7 @@ NextVerify
22
LDR r2,[r3],#4 ; fetch the first word
TEQ r2,#&20000000 ; is it the magic terminator
TEQ r2,#DefectList_End ; is it the magic terminator
Pull "r0-r3",EQ ; it is: recover registers...
BEQ %FT30 ; ... and out
MOV r0,#FSControl_AddDefect ; else add it as a defect
......@@ -1736,7 +1736,7 @@ NextVerify
; more complications caused by two word defects now...
LDR r0,sectorop
CMP r0,#BigDiscSupport
CMP r0,#CreateFlag_BigDiscSupport
BNE %FT05 ; go and take the easy option...
[ debugag
......@@ -1816,7 +1816,7 @@ NextVerify
LDR r14,[r8,#fw_currentdefect]
STR r2,[r14],#4
STR r1,[r14],#4
MOV r0,#&20000000
MOV r0,#DefectList_End
STR r0,[r14]
STR r0,[r14,#4]
STR r14,[r8,#fw_currentdefect]
......@@ -1900,7 +1900,7 @@ NextVerify
BNE %FT50
LDR r14,[r8,#fw_currentdefect]
STR r0,[r14],#4
MOV r1,#&20000000
MOV r1,#DefectList_End
STR r1,[r14]
STR r14,[r8,#fw_currentdefect]
50
......
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